You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/31 21:12:01 UTC
svn commit: r730462 - in /maven/components/branches/maven-2.1.x: ./
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Wed Dec 31 12:12:01 2008
New Revision: 730462
URL: http://svn.apache.org/viewvc?rev=730462&view=rev
Log:
[MNG-3948] Remote repos defined by profiles outside of settings.xml are not used to resolve parent POMs
o Merged from r730461
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 31 12:12:01 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902,726845,729292
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=730462&r1=730461&r2=730462&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Dec 31 12:12:01 2008
@@ -1165,22 +1165,6 @@
{
Model originalModel = ModelUtils.cloneModel( model );
-
- if ( !model.getRepositories().isEmpty() )
- {
- List respositories = buildArtifactRepositories( model );
-
- for ( Iterator it = respositories.iterator(); it.hasNext(); )
- {
- ArtifactRepository repository = (ArtifactRepository) it.next();
-
- if ( !aggregatedRemoteWagonRepositories.contains( repository ) )
- {
- aggregatedRemoteWagonRepositories.add( repository );
- }
- }
- }
-
ProfileManager externalProfileManager = config.getGlobalProfileManager();
ProfileManager profileManager;
if ( externalProfileManager != null )
@@ -1218,6 +1202,21 @@
e.getMessage(), e );
}
+ if ( !model.getRepositories().isEmpty() )
+ {
+ List respositories = buildArtifactRepositories( model );
+
+ for ( Iterator it = respositories.iterator(); it.hasNext(); )
+ {
+ ArtifactRepository repository = (ArtifactRepository) it.next();
+
+ if ( !aggregatedRemoteWagonRepositories.contains( repository ) )
+ {
+ aggregatedRemoteWagonRepositories.add( repository );
+ }
+ }
+ }
+
MavenProject project = new MavenProject( model );
project.setActiveProfiles( activeProfiles );