Skip to content

Commit

Permalink
[MNG-5984] Maven core extension resolution ignores repositories from …
Browse files Browse the repository at this point in the history
…activeByDefault profiles in settings.xml

o Updated to make any repositories from settings available to the model resolver
  used to resolve core extensions.
  • Loading branch information
ChristianSchulte committed Feb 26, 2016
1 parent 62374f5 commit 5a4d548
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ public int doMain( CliRequest cliRequest )
populateRequest( cliRequest );
encryption( cliRequest );
repository( cliRequest );
profiles( cliRequest );
return execute( cliRequest );
}
catch ( ExitException e )
Expand Down Expand Up @@ -670,6 +671,10 @@ protected void configure()

request = executionRequestPopulator.populateDefaults( request );

profileSelector = container.lookup( ProfileSelector.class );

profiles( request );

BootstrapCoreExtensionManager resolver = container.lookup( BootstrapCoreExtensionManager.class );

return Collections.unmodifiableList( resolver.loadCoreExtensions( request, providedArtifacts,
Expand Down Expand Up @@ -866,9 +871,16 @@ private void repository( CliRequest cliRequest )
{
cliRequest.request.setUseLegacyLocalRepository( true );
}
}

// Adds repositories from settings profiles.
final MavenExecutionRequest request = cliRequest.getRequest();
private void profiles( final CliRequest request )
{
this.profiles( request.getRequest() );
}

private void profiles( final MavenExecutionRequest request )
{
// Adds repositories from profiles.
final DefaultProfileActivationContext profileActivationContext = new DefaultProfileActivationContext();
profileActivationContext.setActiveProfileIds( request.getActiveProfiles() );
profileActivationContext.setInactiveProfileIds( request.getInactiveProfiles() );
Expand Down

0 comments on commit 5a4d548

Please sign in to comment.