svn commit: r220344 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: MavenProject.java inheritance/DefaultModelInheritanceAssembler.java

[brett]

Author: brett
Date: Fri Jul 22 08:36:34 2005
New Revision: 220344

URL: http://svn.apache.org/viewcvs?rev=220344&view=rev
Log:
PR: MNG-593
ensure there are no duplicates in the assembled model's dependency list

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=220344&r1=220343&r2=220344&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Fri Jul 22 08:36:34 2005
@@ -218,9 +218,9 @@
         }
     }
 
-    public void setDependencies( List denpendencies )
+    public void setDependencies( List dependencies )
     {
-        model.setDependencies( denpendencies );
+        model.setDependencies( dependencies );
     }
 
     public List getDependencies()

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=220344&r1=220343&r2=220344&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Fri Jul 22 08:36:34 2005
@@ -165,12 +165,22 @@
         // Dependencies :: aggregate
         List dependencies = parent.getDependencies();
 
-        for ( Iterator iterator = dependencies.iterator(); iterator.hasNext(); 
)
-        {
-            Dependency dependency = (Dependency) iterator.next();
+        List childDeps = child.getDependencies();
 
-            child.addDependency( dependency );
+        Map mappedChildDeps = new TreeMap();
+        for ( Iterator it = childDeps.iterator(); it.hasNext(); )
+        {
+            Dependency dep = (Dependency) it.next();
+            mappedChildDeps.put( dep.getManagementKey(), dep );
+        }
 
+        for ( Iterator it = parent.getDependencies().iterator(); it.hasNext(); 
)
+        {
+            Dependency dep = (Dependency) it.next();
+            if ( !mappedChildDeps.containsKey( dep.getManagementKey() ) )
+            {
+                child.addDependency( dep );
+            }
         }
 
         // Repositories :: aggregate



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]