svn commit: r807576 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

[be...@apache.org]

Author: bentmann
Date: Tue Aug 25 12:24:36 2009
New Revision: 807576

URL: http://svn.apache.org/viewvc?rev=807576&view=rev
Log:
[MNG-4321] [regression] Configuration from plugin management is not applied to goals invoked from CLI

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=807576&r1=807575&r2=807576&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Aug 25 12:24:36 2009
@@ -934,7 +934,16 @@
 
         String a = mojoExecution.getArtifactId();
 
-        Plugin plugin = project.getPlugin( g + ":" + a );
+        Plugin plugin = findPlugin( g, a, project.getBuildPlugins() );
+
+        boolean managedPlugin = false;
+
+        if ( plugin == null && project.getPluginManagement() != null )
+        {
+            plugin = findPlugin( g, a, project.getPluginManagement().getPlugins() );
+
+            managedPlugin = true;
+        }
 
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
 
@@ -956,7 +965,7 @@
                      * execution. For goals invoked from the CLI or a forked execution, we need to grab the default
                      * parameter values explicitly.
                      */
-                    if ( !e.getGoals().contains( mojoExecution.getGoal() ) )
+                    if ( managedPlugin || !e.getGoals().contains( mojoExecution.getGoal() ) )
                     {
                         Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
 
@@ -1157,13 +1166,19 @@
 
     private Plugin findPlugin( Plugin plugin, Collection<Plugin> plugins )
     {
-        for ( Plugin p : plugins )
+        return findPlugin( plugin.getGroupId(), plugin.getArtifactId(), plugins );
+    }
+
+    private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin> plugins )
+    {
+        for ( Plugin plugin : plugins )
         {
-            if ( p.getKey().equals( plugin.getKey() ) )
+            if ( artifactId.equals( plugin.getArtifactId() ) && groupId.equals( plugin.getGroupId() ) )
             {
-                return p;
+                return plugin;
             }
         }
+
         return null;
     }