svn commit: r786910 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java

[bentmann]

Author: bentmann
Date: Sat Jun 20 21:22:54 2009
New Revision: 786910

URL: http://svn.apache.org/viewvc?rev=786910&view=rev
Log:
[MNG-4214] [regression] Parent POMs cannot be resolved from mirrored repos

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
    
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=786910&r1=786909&r2=786910&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
 Sat Jun 20 21:22:54 2009
@@ -21,7 +21,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
@@ -90,18 +89,11 @@
         {
             ArtifactRepository repo = 
repositorySystem.buildArtifactRepository( repository );
 
-            ArtifactRepository mirror = repositorySystem.getMirrors( 
Arrays.asList( repo ) ).get( 0 );
+            List<ArtifactRepository> mirrors = repositorySystem.getMirrors( 
Arrays.asList( repo ) );
 
-            for ( Iterator<ArtifactRepository> it = 
remoteRepositories.iterator(); it.hasNext(); )
-            {
-                ArtifactRepository remoteRepository = it.next();
-                if ( mirror.getId().equals( remoteRepository.getId() ) )
-                {
-                    it.remove();
-                }
-            }
+            remoteRepositories.addAll( 0, mirrors );
 
-            remoteRepositories.add( 0, mirror );
+            remoteRepositories = repositorySystem.getEffectiveRepositories( 
remoteRepositories );
         }
         catch ( Exception e )
         {

Modified: 
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java?rev=786910&r1=786909&r2=786910&view=diff
==============================================================================
--- 
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
 (original)
+++ 
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
 Sat Jun 20 21:22:54 2009
@@ -303,7 +303,10 @@
             return;
         }
 
-        for ( Repository repository : model.getRepositories() )
+        List<Repository> repositories = model.getRepositories();
+        Collections.reverse( repositories );
+
+        for ( Repository repository : repositories )
         {
             try
             {