Author: brett
Date: Fri Aug 26 05:23:20 2005
New Revision: 240218
URL: http://svn.apache.org/viewcvs?rev=240218&view=rev
Log:
PR: MNG-753
add a missing need for the super repository
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=240218&r1=240217&r2=240218&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
Fri Aug 26 05:23:20 2005
@@ -276,8 +276,8 @@
modelCache.put( createCacheKey( model.getGroupId(),
model.getArtifactId(), model.getVersion() ), model );
MavenProject project = build( projectDescriptor.getAbsolutePath(),
model, localRepository,
- Collections.EMPTY_LIST,
projectDescriptor.getAbsoluteFile().getParentFile(),
- profileManager );
+ buildArtifactRepositories(
getSuperModel() ),
+
projectDescriptor.getAbsoluteFile().getParentFile(), profileManager );
if ( project.getDistributionManagement() != null &&
project.getDistributionManagement().getStatus() != null )
{
@@ -508,8 +508,7 @@
// only add the super repository if it wasn't overridden by a profile
or project
List repositories = new ArrayList( aggregatedRemoteWagonRepositories );
- List superRepositories = ProjectUtils.buildArtifactRepositories(
superModel.getRepositories(),
-
artifactRepositoryFactory, container );
+ List superRepositories = buildArtifactRepositories( superModel );
for ( Iterator i = superRepositories.iterator(); i.hasNext(); )
{
ArtifactRepository repository = (ArtifactRepository) i.next();
@@ -533,6 +532,12 @@
return project;
}
+ private List buildArtifactRepositories( Model model )
+ throws ProjectBuildingException
+ {
+ return ProjectUtils.buildArtifactRepositories(
model.getRepositories(), artifactRepositoryFactory, container );
+ }
+
/**
* @todo can this take in a model instead of a project and still be
successful?
* @todo In fact, does project REALLY need a MavenProject as a parent?
Couldn't it have just a wrapper around a
@@ -664,8 +669,7 @@
{
if ( !model.getRepositories().isEmpty() )
{
- List respositories = ProjectUtils.buildArtifactRepositories(
model.getRepositories(),
-
artifactRepositoryFactory, container );
+ List respositories = buildArtifactRepositories( model );
for ( Iterator it = respositories.iterator(); it.hasNext(); )
{
@@ -1114,8 +1118,7 @@
{
project.setFile( new File( ".", "pom.xml" ) );
- List remoteRepositories = ProjectUtils.buildArtifactRepositories(
superModel.getRepositories(),
-
artifactRepositoryFactory, container );
+ List remoteRepositories = buildArtifactRepositories( superModel );
project = processProjectLogic( "<Super-POM>", project,
remoteRepositories, null );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
