You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/12/24 23:16:49 UTC
[maven] branch MNG-6114 updated (6eed791 -> ace87eb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6114
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 6eed791 [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
new ace87eb [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6eed791)
\
N -- N -- N refs/heads/MNG-6114 (ace87eb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven] 01/01: [MNG-6114] Elements from the global settings should
be ordered before elements from the user settings
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6114
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ace87eb0a6a60a3d0bbcfe2f7de50120d1c8789f
Author: Christian Schulte <sc...@apache.org>
AuthorDate: Sat Nov 12 21:06:19 2016 +0100
[MNG-6114] Elements from the global settings should be ordered before elements from the user settings
This closes #142 and closes #418
---
.../java/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 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 );
}
/**