Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4321] [regression] Configuration from plugin management is not applied to goals invoked from CLI 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@807576 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-25 12:24:36 +00:00
parent a3eba702af
commit 84803c54c6
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -934,7 +934,16 @@ public class DefaultLifecycleExecutor
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 @@ public class DefaultLifecycleExecutor
* 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 @@ public class DefaultLifecycleExecutor
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;
}