svn commit: r633014 - /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[nicolas]

Author: nicolas
Date: Mon Mar  3 01:57:39 2008
New Revision: 633014

URL: http://svn.apache.org/viewvc?rev=633014&view=rev
Log:
MNG-3426 : dependencies set at <plugin> configuration MUST override 
dependencies declared by plugin POM.
Use a LinkedHashSet to ensure predictable dependencies ordering 

Modified:
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=633014&r1=633013&r2=633014&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Mon Mar  3 01:57:39 2008
@@ -91,6 +91,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -696,8 +697,10 @@
 
             checkPlexusUtils( resolutionGroup, artifactFactory );
 
-            Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
-            dependencies.addAll( 
pluginDescriptor.getIntroducedDependencyArtifacts() );
+            // [MNG-3426] resolve the plugin dependencies specified in 
<plugin><dependencies> first
+            // a LinkedHashSet is used to ensure predictable dependency 
ordering
+            Set dependencies = new LinkedHashSet( 
pluginDescriptor.getIntroducedDependencyArtifacts() );
+            dependencies.addAll( resolutionGroup.getArtifacts() );
 
             List repositories = new ArrayList();
             repositories.addAll( resolutionGroup.getResolutionRepositories() );