[3/3] maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
[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/6d17c079
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6d17c079
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6d17c079
Branch: refs/heads/MNG-6114
Commit: 6d17c0796c751f723c0e748d3fa8bb4df893ff59
Parents: 34afec6
Author: Christian Schulte
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte
Committed: Wed Mar 8 19:43:14 2017 +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/6d17c079/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 dominantById = mapById( dominant );
+final List 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 );
}
/**
[45/45] maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
[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/85cd59bf
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/85cd59bf
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/85cd59bf
Branch: refs/heads/MNG-6114
Commit: 85cd59bf8b34f48077fd8f60b0cf511d1de2c3f6
Parents: 114ef6c
Author: Christian Schulte
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte
Committed: Wed Mar 8 18:03:32 2017 +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/85cd59bf/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 dominantById = mapById( dominant );
+final List 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 );
}
/**
[4/4] maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
[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/f4ac51d3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f4ac51d3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f4ac51d3
Branch: refs/heads/MNG-6114
Commit: f4ac51d3fbdd65d68af9da3666298b5d54a0cf1b
Parents: a3cdfbb
Author: Christian Schulte
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte
Committed: Tue Jan 31 22:54:14 2017 +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/f4ac51d3/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 dominantById = mapById( dominant );
+final List 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 );
}
/**
maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
Repository: maven
Updated Branches:
refs/heads/MNG-6114 [created] 74545c486
[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/74545c48
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/74545c48
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/74545c48
Branch: refs/heads/MNG-6114
Commit: 74545c48641e99a5dba760e621fbc300cb64b90d
Parents: 2678388
Author: Christian Schulte
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte
Committed: Tue Jan 31 20:05:49 2017 +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/74545c48/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 dominantById = mapById( dominant );
+final List 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 );
}
/**
maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
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
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte
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 dominantById = mapById( dominant );
+final List 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 );
}
/**
