You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/14 14:18:02 UTC
svn commit: r726431 - in /maven/components/branches/maven-2.1.x: ./
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Author: bentmann
Date: Sun Dec 14 05:18:02 2008
New Revision: 726431
URL: http://svn.apache.org/viewvc?rev=726431&view=rev
Log:
[MNG-3906] Project-level plugin dependencies are in random order after merging
o Merged from r726417
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 05:18:02 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=726431&r1=726430&r2=726431&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Sun Dec 14 05:18:02 2008
@@ -1520,21 +1520,24 @@
{
Map depsMap = new LinkedHashMap();
- if ( parent != null )
+ if ( child != null )
{
- for ( Iterator it = parent.iterator(); it.hasNext(); )
+ for ( Iterator it = child.iterator(); it.hasNext(); )
{
Dependency dependency = (Dependency) it.next();
depsMap.put( dependency.getManagementKey(), dependency );
}
}
- if ( child != null )
+ if ( parent != null )
{
- for ( Iterator it = child.iterator(); it.hasNext(); )
+ for ( Iterator it = parent.iterator(); it.hasNext(); )
{
Dependency dependency = (Dependency) it.next();
- depsMap.put( dependency.getManagementKey(), dependency );
+ if ( !depsMap.containsKey( dependency.getManagementKey() ) )
+ {
+ depsMap.put( dependency.getManagementKey(), dependency );
+ }
}
}
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=726431&r1=726430&r2=726431&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Sun Dec 14 05:18:02 2008
@@ -34,7 +34,6 @@
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -249,34 +248,7 @@
private void assembleDependencyInheritance( Model child, Model parent )
{
- Map depsMap = new LinkedHashMap();
-
- List deps = child.getDependencies();
-
- if ( deps != null )
- {
- for ( Iterator it = deps.iterator(); it.hasNext(); )
- {
- Dependency dependency = (Dependency) it.next();
- depsMap.put( dependency.getManagementKey(), dependency );
- }
- }
-
- deps = parent.getDependencies();
-
- if ( deps != null )
- {
- for ( Iterator it = deps.iterator(); it.hasNext(); )
- {
- Dependency dependency = (Dependency) it.next();
- if ( !depsMap.containsKey( dependency.getManagementKey() ) )
- {
- depsMap.put( dependency.getManagementKey(), dependency );
- }
- }
- }
-
- child.setDependencies( new ArrayList( depsMap.values() ) );
+ child.setDependencies( ModelUtils.mergeDependencyList( child.getDependencies(), parent.getDependencies() ) );
}
private void assembleBuildInheritance( Model child, Model parent )