Author: jdcasey
Date: Thu Nov 2 07:37:25 2006
New Revision: 470392
URL: http://svn.apache.org/viewvc?view=rev&rev=470392
Log:
[MNG-2539] Allowing plugin-level dependencies to be resolved from project
repositories in addition to plugin repositories...project repositories have the
lower precedence in this.
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/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=470392&r1=470391&r2=470392
==============================================================================
---
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 Nov 2 07:37:25 2006
@@ -615,10 +615,14 @@
Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
dependencies.addAll(
pluginDescriptor.getIntroducedDependencyArtifacts() );
+
+ List repositories = new ArrayList();
+ repositories.addAll( resolutionGroup.getResolutionRepositories() );
+ repositories.addAll( project.getRemoteArtifactRepositories() );
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( dependencies, pluginArtifact,
localRepository,
-
resolutionGroup.getResolutionRepositories(),
+
repositories,
artifactMetadataSource,
artifactFilter );