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

o Fixed parent resolution from settings' repositories 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778127 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-24 12:12:38 +00:00
parent a2170b03c6
commit 49b8b62ef1
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -38,6 +38,7 @@
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.model.interpolator.Interpolator;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.lifecycle.LifecycleBindingsInjector;
@ -387,8 +388,35 @@ private DomainModel build( String projectId, File pomFile, ProjectBuilderConfigu
List<DomainModel> domainModels = new ArrayList<DomainModel>();
domainModels.add( domainModel );
ArtifactRepository localRepository = projectBuilderConfiguration.getLocalRepository();
List<ArtifactRepository> remoteRepositories = projectBuilderConfiguration.getRemoteRepositories();
List<ArtifactRepository> remoteRepositories = new ArrayList<ArtifactRepository>();
try
{
for ( Profile profile : profileSelector.getActiveProfiles( projectBuilderConfiguration.getProfiles(),
projectBuilderConfiguration ) )
{
for ( Repository repository : profile.getRepositories() )
{
try
{
remoteRepositories.add( repositorySystem.buildArtifactRepository( repository ) );
}
catch ( InvalidRepositoryException e )
{
throw new ProjectBuildingException( projectId, "Failed to create remote repository "
+ repository, pomFile, e );
}
}
}
remoteRepositories = repositorySystem.getMirrors( remoteRepositories );
}
catch ( ProfileActivationException e )
{
throw new ProjectBuildingException( projectId, "Failed to determine active profiles", pomFile, e );
}
remoteRepositories.addAll( projectBuilderConfiguration.getRemoteRepositories() );
File parentFile = null;
int lineageCount = 0;