Repository: maven Updated Branches: refs/heads/master 425289c5e -> c940b8410
[MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml o Updated to process command line options before processing any settings. Profile activation needs to be performed with any options already in effect. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c940b841 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c940b841 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c940b841 Branch: refs/heads/master Commit: c940b84107d6df72d625529a7df3402ef6b4e12b Parents: 425289c Author: Christian Schulte <schu...@apache.org> Authored: Fri Feb 26 18:31:58 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Fri Feb 26 18:31:58 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/settings/SettingsUtils.java | 2 +- maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/c940b841/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java index 8da696e..16ccdb6 100644 --- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java +++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java @@ -139,7 +139,7 @@ public final class SettingsUtils profile.setId( settingsProfile.getId() ); - profile.setSource( "settings.xml" ); + profile.setSource( org.apache.maven.model.Profile.SOURCE_SETTINGS ); Activation settingsActivation = settingsProfile.getActivation(); http://git-wip-us.apache.org/repos/asf/maven/blob/c940b841/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 04f504e..93b25d6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -280,9 +280,9 @@ public class MavenCli properties( cliRequest ); localContainer = container( cliRequest ); commands( cliRequest ); + populateRequest( cliRequest ); configure( cliRequest ); toolchains( cliRequest ); - populateRequest( cliRequest ); encryption( cliRequest ); repository( cliRequest ); return execute( cliRequest );
