svn commit: r548228 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[jvanzyl]

Author: jvanzyl
Date: Sun Jun 17 23:10:00 2007
New Revision: 548228

URL: http://svn.apache.org/viewvc?view=rev&rev=548228
Log:
MNG-3059 Make sure that dependencies listed in plugins are obeyed
Submitted by: Eric Redmond

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=548228&r1=548227&r2=548228
==============================================================================
--- 
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
 Sun Jun 17 23:10:00 2007
@@ -491,10 +491,13 @@
 
         checkPlexusUtils( resolutionGroup, artifactFactory );
 
-        Set dependencies = new LinkedHashSet( resolutionGroup.getArtifacts() );
+        Set dependencies = new LinkedHashSet();
 
-        // Also resolve the plugin dependencies specified in 
<plugin><dependencies>:
+        // resolve the plugin dependencies specified in <plugin><dependencies> 
first:
         dependencies.addAll( projectPluginDependencies );
+
+        // followed by the plugin's default artifact set
+        dependencies.addAll( resolutionGroup.getArtifacts() );
 
         List repositories = new ArrayList();