Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4401] [regression] central repository is tried before explicitly declared repositories during parent POM resolution 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829157 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-10-23 18:06:34 +00:00
parent d8942acd68
commit 8d38204e16
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
View File

@ -55,6 +55,8 @@ class RepositoryModelResolver
private ProjectBuildingRequest projectBuildingRequest;
private List<ArtifactRepository> pomRepositories;
private List<ArtifactRepository> remoteRepositories;
private ReactorModelPool reactorModelPool;
@ -88,6 +90,8 @@ public RepositoryModelResolver( RepositorySystem repositorySystem, ResolutionErr
this.remoteRepositories.addAll( projectBuildingRequest.getRemoteRepositories() );
}
this.pomRepositories = new ArrayList<ArtifactRepository>();
this.repositoryIds = new HashSet<String>();
this.reactorModelPool = reactorModelPool;
@ -101,6 +105,7 @@ private RepositoryModelResolver( RepositoryModelResolver original )
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 @@ public void addRepository( Repository repository )
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 );
}