You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/06/23 10:40:17 UTC
svn commit: r193111 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: jdcasey
Date: Thu Jun 23 01:40:15 2005
New Revision: 193111
URL: http://svn.apache.org/viewcvs?rev=193111&view=rev
Log:
Fixing bug with resolving plugins and their deps.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.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=193111&r1=193110&r2=193111&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 Jun 23 01:40:15 2005
@@ -555,14 +555,18 @@
MavenMetadataSource metadataSource = new MavenMetadataSource( artifactResolver, mavenProjectBuilder,
artifactFactory );
- List remoteArtifactRepositories = project.getRemoteArtifactRepositories();
+ List remoteRepositories = new ArrayList();
+
+ remoteRepositories.addAll( project.getRemoteArtifactRepositories() );
+ remoteRepositories.addAll( project.getPluginArtifactRepositories() );
+
ArtifactRepository localRepository = session.getLocalRepository();
Set dependencies = metadataSource.retrieve( pluginArtifact, localRepository,
- remoteArtifactRepositories );
+ remoteRepositories );
ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, pluginArtifact,
localRepository,
- remoteArtifactRepositories,
+ remoteRepositories,
metadataSource,
artifactFilter );
@@ -587,7 +591,7 @@
ArtifactFilter distroProvidedFilter = new InversionArtifactFilter( artifactFilter );
ArtifactResolutionResult distroProvidedResult = artifactResolver
- .resolveTransitively( dependencies, pluginArtifact, localRepository, remoteArtifactRepositories,
+ .resolveTransitively( dependencies, pluginArtifact, localRepository, remoteRepositories,
metadataSource, distroProvidedFilter );
Set distroProvided = distroProvidedResult.getArtifacts();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org