From 13866ddf52ce7c9457d136e000ee9fdd607ed136 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 12 Nov 2016 21:06:19 +0100 Subject: [PATCH] [MNG-6114] Elements from the global settings should be ordered before elements from the user settings This closes #142 and closes #418 --- .../org/apache/maven/settings/merge/MavenSettingsMerger.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 8d9f67b1fcbe..cb5f6c166f1f 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 @@ private static void shallowMergeById( List domin String recessiveSourceLevel ) { Map dominantById = mapById( dominant ); + final List identifiables = new ArrayList<>( recessive.size() ); for ( T identifiable : recessive ) { @@ -118,9 +119,11 @@ private static void shallowMergeById( List domin { identifiable.setSourceLevel( recessiveSourceLevel ); - dominant.add( identifiable ); + identifiables.add( identifiable ); } } + + dominant.addAll( 0, identifiables ); } /**