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:09:28 UTC
svn commit: r730461 -
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Wed Dec 31 12:09:27 2008
New Revision: 730461
URL: http://svn.apache.org/viewvc?rev=730461&view=rev
Log:
[MNG-3948] Remote repos defined by profiles outside of settings.xml are not used to resolve parent POMs
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=730461&r1=730460&r2=730461&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Dec 31 12:09:27 2008
@@ -1137,22 +1137,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 )
@@ -1190,6 +1174,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 );