svn commit: r769860 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[jv...@apache.org]

Author: jvanzyl
Date: Wed Apr 29 18:06:28 2009
New Revision: 769860

URL: http://svn.apache.org/viewvc?rev=769860&view=rev
Log:
o comment out plugin configuration merging code, this should all be handled by the pom builder now. none of this can happen in the plugin manager as its responsibility is purely executing plugins for the framework

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

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=769860&r1=769859&r2=769860&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Apr 29 18:06:28 2009
@@ -307,8 +307,14 @@
         // followed by the plugin's default artifact set
         dependencies.addAll( pluginArtifacts );
 
-        ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( pluginArtifact ).setArtifactDependencies( dependencies ).setLocalRepository( localRepository )
-            .setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) ).setManagedVersionMap( pluginManagedDependencies ).setFilter( filter ).setResolveRoot( false ); // We are setting this to false because the artifact itself has been resolved.
+        ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+            .setArtifact( pluginArtifact )
+            .setArtifactDependencies( dependencies )
+            .setLocalRepository( localRepository )
+            .setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) )
+            .setManagedVersionMap( pluginManagedDependencies )
+            .setFilter( filter )
+            .setResolveRoot( false ); // We are setting this to false because the artifact itself has been resolved.
 
         ArtifactResolutionResult result = repositorySystem.resolve( request );
         resolutionErrorHandler.throwErrors( request, result );
@@ -392,6 +398,7 @@
         // Merge the plugin level configuration with the execution level configuration
         // where the latter is dominant.
 
+        /*
         if ( project.getBuildPlugins() != null )
         {
             for ( Plugin buildPlugin : project.getBuildPlugins() )
@@ -422,6 +429,7 @@
                 }
             }
         }
+        */
 
         String goalExecId = goalName;
         if ( mojoExecution.getExecutionId() != null )