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

[jd...@apache.org]

Author: jdcasey
Date: Thu Mar 20 14:10:55 2008
New Revision: 639459

URL: http://svn.apache.org/viewvc?rev=639459&view=rev
Log:
[MNG-3473] Switching from LinkedHashSet to HashSet (reverting part of commit from revId: 633014) to restore plugin-dependency ordering...seems that the maven-plugin-plugin breaks when we use a deterministic ordering for the dependencies.

We need to fix this, but for now we'll revert to HashSet to get the 2.0.9 release back on its feet.

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=639459&r1=639458&r2=639459&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 Thu Mar 20 14:10:55 2008
@@ -696,8 +696,15 @@
 
             checkPlexusUtils( resolutionGroup, artifactFactory );
 
-            Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
+            // FIXME: We need to control the ordering of plugin dependencies,
+            // but this ordering change currently kills at least the plugin-plugin.
+            // Not sure why (yet).
+            // Set dependencies = new LinkedHashSet();
+            Set dependencies = new HashSet();
             dependencies.addAll( pluginDescriptor.getIntroducedDependencyArtifacts() );
+            dependencies.addAll( resolutionGroup.getArtifacts() );
+
+            getLogger().debug( "Plugin dependencies for:\n\n" + pluginDescriptor.getId() + "\n\nare:\n\n" + StringUtils.join( dependencies.iterator(), "\n" ) + "\n\n" );
 
             List repositories = new ArrayList();
             repositories.addAll( resolutionGroup.getResolutionRepositories() );