michael-o commented on a change in pull request #648:
URL: https://github.com/apache/maven/pull/648#discussion_r778212262
##########
File path: maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
##########
@@ -717,75 +718,62 @@ protected void configure()
return Collections.emptyList();
}
- try
+ List<CoreExtension> extensions = readCoreExtensionsDescriptor(
extensionsFile );
+ if ( extensions.isEmpty() )
{
- List<CoreExtension> extensions = readCoreExtensionsDescriptor(
extensionsFile );
- if ( extensions.isEmpty() )
- {
- return Collections.emptyList();
- }
+ return Collections.emptyList();
+ }
- ContainerConfiguration cc = new DefaultContainerConfiguration() //
- .setClassWorld( cliRequest.classWorld ) //
- .setRealm( containerRealm ) //
- .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) //
- .setAutoWiring( true ) //
- .setJSR250Lifecycle( true ) //
- .setName( "maven" );
+ ContainerConfiguration cc = new DefaultContainerConfiguration() //
+ .setClassWorld( cliRequest.classWorld ) //
+ .setRealm( containerRealm ) //
+ .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) //
+ .setAutoWiring( true ) //
+ .setJSR250Lifecycle( true ) //
+ .setName( "maven" );
- DefaultPlexusContainer container = new DefaultPlexusContainer( cc,
new AbstractModule()
+ DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new
AbstractModule()
+ {
+ @Override
+ protected void configure()
{
- @Override
- protected void configure()
- {
- bind( ILoggerFactory.class ).toInstance(
slf4jLoggerFactory );
- }
- } );
+ bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
+ }
+ } );
- try
- {
- container.setLookupRealm( null );
+ try
+ {
+ container.setLookupRealm( null );
- container.setLoggerManager( plexusLoggerManager );
+ container.setLoggerManager( plexusLoggerManager );
- container.getLoggerManager().setThresholds(
cliRequest.request.getLoggingLevel() );
+ container.getLoggerManager().setThresholds(
cliRequest.request.getLoggingLevel() );
- Thread.currentThread().setContextClassLoader(
container.getContainerRealm() );
+ Thread.currentThread().setContextClassLoader(
container.getContainerRealm() );
- executionRequestPopulator = container.lookup(
MavenExecutionRequestPopulator.class );
+ executionRequestPopulator = container.lookup(
MavenExecutionRequestPopulator.class );
- configurationProcessors = container.lookupMap(
ConfigurationProcessor.class );
+ configurationProcessors = container.lookupMap(
ConfigurationProcessor.class );
- configure( cliRequest );
+ configure( cliRequest );
- MavenExecutionRequest request =
DefaultMavenExecutionRequest.copy( cliRequest.request );
+ MavenExecutionRequest request = DefaultMavenExecutionRequest.copy(
cliRequest.request );
- request = populateRequest( cliRequest, request );
+ request = populateRequest( cliRequest, request );
- request = executionRequestPopulator.populateDefaults( request
);
+ request = executionRequestPopulator.populateDefaults( request );
- BootstrapCoreExtensionManager resolver = container.lookup(
BootstrapCoreExtensionManager.class );
+ BootstrapCoreExtensionManager resolver = container.lookup(
BootstrapCoreExtensionManager.class );
- return Collections.unmodifiableList(
resolver.loadCoreExtensions( request, providedArtifacts,
-
extensions ) );
+ return Collections.unmodifiableList( resolver.loadCoreExtensions(
request, providedArtifacts,
+
extensions ) );
- }
- finally
- {
- executionRequestPopulator = null;
- container.dispose();
- }
- }
- catch ( RuntimeException e )
- {
- // runtime exceptions are most likely bugs in maven, let them
bubble up to the user
- throw e;
}
- catch ( Exception e )
+ finally
{
- slf4jLogger.warn( "Failed to read extensions descriptor {}: {}",
extensionsFile, e.getMessage() );
Review comment:
Insane, that stupid simple!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
