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

[jdcasey]

Author: jdcasey
Date: Tue Jun  5 15:38:33 2007
New Revision: 544662

URL: http://svn.apache.org/viewvc?view=rev&rev=544662
Log:
[MNG-3037] Combining plugin dependencies with plugin-level dependencies from 
the current project PRIOR to resolution, to enable version-conflict resolution 
to take place between the two sets of dependencies.

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=544662&r1=544661&r2=544662
==============================================================================
--- 
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
 Tue Jun  5 15:38:33 2007
@@ -490,7 +490,10 @@
 
         checkPlexusUtils( resolutionGroup, artifactFactory );
 
-        Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
+        Set dependencies = new LinkedHashSet( resolutionGroup.getArtifacts() );
+
+        // Also resolve the plugin dependencies specified in 
<plugin><dependencies>:
+        dependencies.addAll( projectPluginDependencies );
 
         List repositories = new ArrayList();
 
@@ -505,19 +508,6 @@
                                                                                
 coreArtifactFilterManager.getArtifactFilter() );
 
         List resolved = new ArrayList( result.getArtifacts() );
-
-        getLogger().debug( "Main plugin artifacts: " + 
resolved.toString().replace( ',', '\n' ) );
-
-        // Also resolve the plugin dependencies specified in 
<plugin><dependencies>:
-        resolved.addAll( artifactResolver.resolveTransitively( 
projectPluginDependencies,
-                                                               pluginArtifact,
-                                                               
project.getManagedVersionMap(),
-                                                               localRepository,
-                                                               repositories,
-                                                               
artifactMetadataSource,
-                                                               
coreArtifactFilterManager.getArtifactFilter() ).getArtifacts() );
-
-        getLogger().debug( "After adding project-level plugin dependencies: " 
+ resolved.toString().replace( ',', '\n' ) );
 
         for ( Iterator it = resolved.iterator(); it.hasNext(); )
         {