svn commit: r189670 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[jdcasey]

Author: jdcasey
Date: Wed Jun  8 16:56:12 2005
New Revision: 189670

URL: http://svn.apache.org/viewcvs?rev=189670&view=rev
Log:
Follow-on to finish the fix for MNG-421.

This adds external profile repositories to the artifactRepository construction 
used in resolving parent POMs.


Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=189670&r1=189669&r2=189670&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Wed Jun  8 16:56:12 2005
@@ -31,6 +31,7 @@
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
+import org.apache.maven.model.Repository;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.profile.activation.ProfileActivationCalculator;
 import org.apache.maven.project.artifact.MavenMetadataSource;
@@ -223,6 +224,23 @@
 
         List aggregatedRemoteWagonRepositories = 
ProjectUtils.buildArtifactRepositories( superModel.getRepositories(), 
artifactRepositoryFactory, container );
 
+        for ( Iterator i = externalProfiles.iterator(); i.hasNext(); )
+        {
+            Profile externalProfile = (Profile) i.next();
+            
+            for ( Iterator repoIterator = 
externalProfile.getRepositories().iterator(); repoIterator.hasNext(); )
+            {
+                Repository mavenRepo = (Repository) repoIterator.next();
+
+                ArtifactRepository artifactRepo = 
ProjectUtils.buildArtifactRepository( mavenRepo, artifactRepositoryFactory, 
container );
+
+                if ( !aggregatedRemoteWagonRepositories.contains( artifactRepo 
) )
+                {
+                    aggregatedRemoteWagonRepositories.add( artifactRepo );
+                }
+            }
+        }
+        
         MavenProject project = assembleLineage( model, lineage, 
aggregatedRemoteWagonRepositories, localRepository );
 
         Model previous = superModel;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]