Author: jdcasey
Date: Fri Jul 15 15:13:10 2005
New Revision: 219252
URL: http://svn.apache.org/viewcvs?rev=219252&view=rev
Log:
Attempting to fix problem with resolution of parent-poms for plugins, but
continuing the use of the plugin repository when assembling the plugin-pom's
lineage.
NOTE: I have not bootstrapped with this fix in place (I'm in the middle of
something else right now), so BEWARE!
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=219252&r1=219251&r2=219252&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 Jul 15 15:13:10 2005
@@ -194,7 +194,7 @@
// Always cache files in the source tree over those in the repository
modelCache.put( createCacheKey( model.getGroupId(),
model.getArtifactId(), model.getVersion() ), model );
- MavenProject project = build( projectDescriptor.getAbsolutePath(),
model, localRepository, externalProfiles );
+ MavenProject project = build( projectDescriptor.getAbsolutePath(),
model, localRepository, Collections.EMPTY_LIST, externalProfiles );
// Only translate the base directory for files in the source tree
pathTranslator.alignToBaseDirectory( project.getModel(),
projectDescriptor );
@@ -216,7 +216,7 @@
{
Model model = findModelFromRepository( artifact,
remoteArtifactRepositories, localRepository );
- return build( "Artifact [" + artifact.getId() + "]", model,
localRepository, Collections.EMPTY_LIST );
+ return build( "Artifact [" + artifact.getId() + "]", model,
localRepository, remoteArtifactRepositories, Collections.EMPTY_LIST );
}
private Model findModelFromRepository( Artifact artifact, List
remoteArtifactRepositories,
@@ -263,17 +263,25 @@
}
private MavenProject build( String pomLocation, Model model,
ArtifactRepository localRepository,
- List externalProfiles )
+ List remoteArtifactRepositories, List
externalProfiles )
throws ProjectBuildingException
{
Model superModel = getSuperModel();
LinkedList lineage = new LinkedList();
- List aggregatedRemoteWagonRepositories =
ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
-
artifactRepositoryFactory,
-
container );
-
+ List aggregatedRemoteWagonRepositories;
+ if ( remoteArtifactRepositories == null ||
remoteArtifactRepositories.isEmpty() )
+ {
+ aggregatedRemoteWagonRepositories =
ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
+
artifactRepositoryFactory,
+
container );
+ }
+ else
+ {
+ aggregatedRemoteWagonRepositories = remoteArtifactRepositories;
+ }
+
for ( Iterator i = externalProfiles.iterator(); i.hasNext(); )
{
Profile externalProfile = (Profile) i.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
