From 8d38204e16cd4bbc524a8b2f64068958b97b4820 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 23 Oct 2009 18:06:34 +0000 Subject: [PATCH] [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 --- .../apache/maven/project/RepositoryModelResolver.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java index 38d605a7c7..405e0d6b11 100644 --- a/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java @@ -55,6 +55,8 @@ class RepositoryModelResolver private ProjectBuildingRequest projectBuildingRequest; + private List pomRepositories; + private List remoteRepositories; private ReactorModelPool reactorModelPool; @@ -88,6 +90,8 @@ public RepositoryModelResolver( RepositorySystem repositorySystem, ResolutionErr this.remoteRepositories.addAll( projectBuildingRequest.getRemoteRepositories() ); } + this.pomRepositories = new ArrayList(); + this.repositoryIds = new HashSet(); this.reactorModelPool = reactorModelPool; @@ -101,6 +105,7 @@ private RepositoryModelResolver( RepositoryModelResolver original ) this.reactorModelPool = original.reactorModelPool; this.remoteRepositories = new ArrayList( original.remoteRepositories ); this.repositoryIds = new HashSet( original.repositoryIds ); + this.pomRepositories = new ArrayList( 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(); + remoteRepositories.addAll( pomRepositories ); + remoteRepositories.addAll( projectBuildingRequest.getRemoteRepositories() ); remoteRepositories = repositorySystem.getEffectiveRepositories( remoteRepositories ); }