mirror of https://github.com/apache/maven.git
o Removing the LifecycleExecutor component, not used.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491395 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f253b60b3a
commit
43ec595fed
|
@ -83,10 +83,6 @@ public class MavenEmbedder
|
||||||
{
|
{
|
||||||
public static final String userHome = System.getProperty( "user.home" );
|
public static final String userHome = System.getProperty( "user.home" );
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
|
||||||
// Embedder
|
|
||||||
// ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
private PlexusContainer container;
|
private PlexusContainer container;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
@ -97,8 +93,6 @@ public class MavenEmbedder
|
||||||
|
|
||||||
private ArtifactRepositoryFactory artifactRepositoryFactory;
|
private ArtifactRepositoryFactory artifactRepositoryFactory;
|
||||||
|
|
||||||
private LifecycleExecutor lifecycleExecutor;
|
|
||||||
|
|
||||||
private WagonManager wagonManager;
|
private WagonManager wagonManager;
|
||||||
|
|
||||||
private MavenXpp3Reader modelReader;
|
private MavenXpp3Reader modelReader;
|
||||||
|
@ -226,12 +220,7 @@ public class MavenEmbedder
|
||||||
|
|
||||||
private MavenExecutionRequest populateMavenExecutionRequestWithDefaults( MavenExecutionRequest request )
|
private MavenExecutionRequest populateMavenExecutionRequestWithDefaults( MavenExecutionRequest request )
|
||||||
{
|
{
|
||||||
// populate the request from
|
|
||||||
// 1. embed request
|
|
||||||
// 2. defaults
|
|
||||||
|
|
||||||
// Local repository
|
// Local repository
|
||||||
|
|
||||||
if ( request.getLocalRepository() == null )
|
if ( request.getLocalRepository() == null )
|
||||||
{
|
{
|
||||||
request.setLocalRepository( localRepository );
|
request.setLocalRepository( localRepository );
|
||||||
|
@ -256,15 +245,11 @@ public class MavenEmbedder
|
||||||
.setBasedir( baseDirectory )
|
.setBasedir( baseDirectory )
|
||||||
.setGoals( goals )
|
.setGoals( goals )
|
||||||
.setLocalRepositoryPath( localRepositoryPath ) // default: ~/.m2/repository
|
.setLocalRepositoryPath( localRepositoryPath ) // default: ~/.m2/repository
|
||||||
.setProperties( executionProperties ) // optional
|
|
||||||
.setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast
|
.setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast
|
||||||
.setRecursive( recursive ) // default: false
|
.setRecursive( recursive ) // default: false
|
||||||
.setUseReactor( useReactor ) // default: true
|
.setUseReactor( useReactor ) // default: true
|
||||||
.setPomFile( alternatePomFile ) // optional
|
|
||||||
.setShowErrors( showErrors ) // default: false
|
.setShowErrors( showErrors ) // default: false
|
||||||
.setInteractiveMode( interactive ) // default: false
|
.setInteractiveMode( interactive ) // default: false
|
||||||
.addActiveProfiles( activeProfiles ) // optional
|
|
||||||
.addInactiveProfiles( inactiveProfiles ) // optional
|
|
||||||
.setLoggingLevel( loggingLevel ) // default: info
|
.setLoggingLevel( loggingLevel ) // default: info
|
||||||
.setSettings( settings ) // default: ~/.m2/settings.xml
|
.setSettings( settings ) // default: ~/.m2/settings.xml
|
||||||
.setTransferListener( transferListener ) // default: batch mode which goes along with interactive
|
.setTransferListener( transferListener ) // default: batch mode which goes along with interactive
|
||||||
|
@ -591,8 +576,6 @@ public class MavenEmbedder
|
||||||
defaultArtifactRepositoryLayout =
|
defaultArtifactRepositoryLayout =
|
||||||
(ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );
|
(ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );
|
||||||
|
|
||||||
lifecycleExecutor = (LifecycleExecutor) container.lookup( LifecycleExecutor.ROLE );
|
|
||||||
|
|
||||||
wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
|
wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
|
||||||
|
|
||||||
started = true;
|
started = true;
|
||||||
|
@ -695,8 +678,6 @@ public class MavenEmbedder
|
||||||
container.release( mavenProjectBuilder );
|
container.release( mavenProjectBuilder );
|
||||||
|
|
||||||
container.release( artifactRepositoryFactory );
|
container.release( artifactRepositoryFactory );
|
||||||
|
|
||||||
container.release( lifecycleExecutor );
|
|
||||||
}
|
}
|
||||||
catch ( ComponentLifecycleException e )
|
catch ( ComponentLifecycleException e )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue