Repository: maven Updated Branches: refs/heads/master 57fde44be -> c145eb5b2
[MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c145eb5b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c145eb5b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c145eb5b Branch: refs/heads/master Commit: c145eb5b219b89c306f9e4fa777e517ea87d8f27 Parents: 57fde44 Author: Christian Schulte <schu...@apache.org> Authored: Sat Nov 12 21:06:19 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Nov 12 21:07:31 2016 +0100 ---------------------------------------------------------------------- .../org/apache/maven/settings/merge/MavenSettingsMerger.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/c145eb5b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java index 8d9f67b..cb5f6c1 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java @@ -111,6 +111,7 @@ public class MavenSettingsMerger String recessiveSourceLevel ) { Map<String, T> dominantById = mapById( dominant ); + final List<T> identifiables = new ArrayList<>( recessive.size() ); for ( T identifiable : recessive ) { @@ -118,9 +119,11 @@ public class MavenSettingsMerger { identifiable.setSourceLevel( recessiveSourceLevel ); - dominant.add( identifiable ); + identifiables.add( identifiable ); } } + + dominant.addAll( 0, identifiables ); } /**