From 7c9cdbc071925e7d1da678cfee7370cce5a9ee83 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 29 Apr 2009 19:03:24 +0000 Subject: [PATCH] o remove unrequired code git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769877 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugin/DefaultPluginManager.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 07dfb008e8..d3856ac713 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -393,44 +393,6 @@ public class DefaultPluginManager PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); - // Here we are walking throught the POM to find plugin configuraiton that we - // need to inject into the POM. Shane will soon take care of this. - // Merge the plugin level configuration with the execution level configuration - // where the latter is dominant. - - /* - if ( project.getBuildPlugins() != null ) - { - for ( Plugin buildPlugin : project.getBuildPlugins() ) - { - // The POM builder should have merged any configuration at the upper level of the plugin - // element with the execution level configuration where our goal is. - - // We have our plugin - if ( buildPlugin.getArtifactId().equals( pluginDescriptor.getArtifactId() ) ) - { - Xpp3Dom dom = (Xpp3Dom) buildPlugin.getConfiguration(); - - // Search through executions - for ( PluginExecution e : buildPlugin.getExecutions() ) - { - // Search though goals to match what's been asked for. - for ( String g : e.getGoals() ) - { - // This goal matches what's been asked for. - if ( g.equals( mojoDescriptor.getGoal() ) ) - { - dom = Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) e.getConfiguration(), dom ); - } - } - } - - mojoExecution.setConfiguration( dom ); - } - } - } - */ - String goalExecId = goalName; if ( mojoExecution.getExecutionId() != null ) {