Author: brett
Date: Thu Jul 21 08:15:54 2005
New Revision: 220102
URL: http://svn.apache.org/viewcvs?rev=220102&view=rev
Log:
PR: MNG-229
- always use super POM's repository for parent resolution
- use correct repository set for plugin dependency resolution
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=220102&r1=220101&r2=220102&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Jul 21 08:15:54 2005
@@ -51,8 +51,8 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.project.path.PathTranslator;
-import org.apache.maven.settings.Settings;
import org.apache.maven.reporting.MavenReport;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@@ -344,7 +344,8 @@
public List getReports( ReportPlugin reportPlugin, ReportSet reportSet,
MavenProject project, MavenSession session,
ArtifactRepository localRepository )
- throws PluginManagerException, PluginVersionResolutionException,
PluginConfigurationException, ArtifactResolutionException
+ throws PluginManagerException, PluginVersionResolutionException,
PluginConfigurationException,
+ ArtifactResolutionException
{
Plugin forLookup = new Plugin();
forLookup.setGroupId( reportPlugin.getGroupId() );
@@ -359,7 +360,6 @@
MojoDescriptor mojoDescriptor = (MojoDescriptor) i.next();
// TODO: check ID is correct for reports
- // TODO: this returns mojos that aren't reports
// if the POM configured no reports, give all from plugin
if ( reportSet == null || reportSet.getReports().contains(
mojoDescriptor.getGoal() ) )
{
@@ -476,11 +476,6 @@
{
MavenMetadataSource metadataSource = new MavenMetadataSource(
mavenProjectBuilder, artifactFactory );
- List remoteRepositories = new ArrayList();
-
- remoteRepositories.addAll(
project.getRemoteArtifactRepositories() );
- remoteRepositories.addAll(
project.getPluginArtifactRepositories() );
-
ArtifactRepository localRepository =
session.getLocalRepository();
ResolutionGroup resolutionGroup = metadataSource.retrieve(
pluginArtifact, localRepository,
@@ -490,7 +485,7 @@
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( dependencies, pluginArtifact,
localRepository,
-
remoteRepositories,
+
resolutionGroup.getResolutionRepositories(),
metadataSource,
artifactFilter );
@@ -549,7 +544,8 @@
if ( artifactFile == null )
{
- String resource = "/META-INF/maven/" + artifact.getGroupId() +
"/" + artifact.getArtifactId() + "/pom.xml";
+ String resource = "/META-INF/maven/" + artifact.getGroupId() +
"/" + artifact.getArtifactId() +
+ "/pom.xml";
URL resourceUrl = container.getContainerRealm().getResource(
resource );
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=220102&r1=220101&r2=220102&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
Thu Jul 21 08:15:54 2005
@@ -283,18 +283,16 @@
LinkedList lineage = new LinkedList();
- List aggregatedRemoteWagonRepositories;
- if ( remoteArtifactRepositories == null ||
remoteArtifactRepositories.isEmpty() )
+ Set aggregatedRemoteWagonRepositories = new HashSet();
+ if ( remoteArtifactRepositories != null &&
!remoteArtifactRepositories.isEmpty() )
{
- aggregatedRemoteWagonRepositories =
ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
-
artifactRepositoryFactory,
-
container );
- }
- else
- {
- aggregatedRemoteWagonRepositories = new ArrayList(
remoteArtifactRepositories );
+ aggregatedRemoteWagonRepositories.addAll(
remoteArtifactRepositories );
}
+ aggregatedRemoteWagonRepositories.addAll(
ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
+
artifactRepositoryFactory,
+
container ) );
+
for ( Iterator i = externalProfiles.iterator(); i.hasNext(); )
{
Profile externalProfile = (Profile) i.next();
@@ -307,14 +305,13 @@
artifactRepositoryFactory,
container );
- if ( !aggregatedRemoteWagonRepositories.contains( artifactRepo
) )
- {
- aggregatedRemoteWagonRepositories.add( artifactRepo );
- }
+ aggregatedRemoteWagonRepositories.add( artifactRepo );
}
}
- MavenProject project = assembleLineage( model, lineage,
aggregatedRemoteWagonRepositories, localRepository );
+ List repositories = new ArrayList( aggregatedRemoteWagonRepositories );
+
+ MavenProject project = assembleLineage( model, lineage, repositories,
localRepository );
// we don't have to force the collision exception for superModel here,
it's already been done in getSuperModel()
Model previous = superModel;
@@ -332,7 +329,7 @@
try
{
- project = processProjectLogic( pomLocation, project,
aggregatedRemoteWagonRepositories, externalProfiles );
+ project = processProjectLogic( pomLocation, project, repositories,
externalProfiles );
}
catch ( ModelInterpolationException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
