svn commit: r225465 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java

[brett]

Author: brett
Date: Tue Jul 26 23:20:40 2005
New Revision: 225465

URL: http://svn.apache.org/viewcvs?rev=225465&view=rev
Log:
PR: MNG-479
child repositories have precedence over parents with the same ID

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

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=225465&r1=225464&r2=225465&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
 Tue Jul 26 23:20:40 2005
@@ -189,13 +189,11 @@
         {
             Repository repository = (Repository) iterator.next();
 
-            // parent will always override child repositories
-            // if there are duplicates
-            if ( childRepositories.contains( repository ) )
+            // child will always override parent repositories if there are 
duplicates
+            if ( !childRepositories.contains( repository ) )
             {
-                childRepositories.remove( repository );
+                child.addRepository( repository );
             }
-            child.addRepository( repository );
         }
 
         // Mojo Repositories :: aggregate

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=225465&r1=225464&r2=225465&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
 Tue Jul 26 23:20:40 2005
@@ -263,7 +263,8 @@
 
         Model child = makeRepositoryModel( "child", "central", 
"http://repo2.maven.org/maven/"; );
 
-        List repos = new ArrayList( parent.getRepositories() );
+        // We want to get the child repository here.
+        List repos = new ArrayList( child.getRepositories() );
 
         assembler.assembleModelInheritance( child, parent );
 



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