svn commit: r829157 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java

[bentmann]

Author: bentmann
Date: Fri Oct 23 18:06:34 2009
New Revision: 829157

URL: http://svn.apache.org/viewvc?rev=829157&view=rev
Log:
[MNG-4401] [regression] central repository is tried before explicitly declared 
repositories during parent POM resolution

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=829157&r1=829156&r2=829157&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
 Fri Oct 23 18:06:34 2009
@@ -55,6 +55,8 @@
 
     private ProjectBuildingRequest projectBuildingRequest;
 
+    private List<ArtifactRepository> pomRepositories;
+
     private List<ArtifactRepository> remoteRepositories;
 
     private ReactorModelPool reactorModelPool;
@@ -88,6 +90,8 @@
             this.remoteRepositories.addAll( 
projectBuildingRequest.getRemoteRepositories() );
         }
 
+        this.pomRepositories = new ArrayList<ArtifactRepository>();
+
         this.repositoryIds = new HashSet<String>();
 
         this.reactorModelPool = reactorModelPool;
@@ -101,6 +105,7 @@
         this.reactorModelPool = original.reactorModelPool;
         this.remoteRepositories = new ArrayList<ArtifactRepository>( 
original.remoteRepositories );
         this.repositoryIds = new HashSet<String>( original.repositoryIds );
+        this.pomRepositories = new ArrayList<ArtifactRepository>( 
original.pomRepositories );
     }
 
     public ModelResolver newCopy()
@@ -126,7 +131,11 @@
 
             repositorySystem.injectAuthentication( Arrays.asList( repo ), 
projectBuildingRequest.getServers() );
 
-            remoteRepositories.add( repo );
+            pomRepositories.add( repo );
+
+            remoteRepositories = new ArrayList<ArtifactRepository>();
+            remoteRepositories.addAll( pomRepositories );
+            remoteRepositories.addAll( 
projectBuildingRequest.getRemoteRepositories() );
 
             remoteRepositories = repositorySystem.getEffectiveRepositories( 
remoteRepositories );
         }