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

o Fixed missing injection of default parameter values for direct goals invocations 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800740 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-04 11:59:57 +00:00
parent a0f1eb3917
commit f3d89b4d5b
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,6 +680,8 @@ public class DefaultLifecycleExecutor
Plugin plugin = project.getPlugin( g + ":" + a ); Plugin plugin = project.getPlugin( g + ":" + a );
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
if ( plugin != null && StringUtils.isNotEmpty( mojoExecution.getExecutionId() ) ) if ( plugin != null && StringUtils.isNotEmpty( mojoExecution.getExecutionId() ) )
{ {
for ( PluginExecution e : plugin.getExecutions() ) for ( PluginExecution e : plugin.getExecutions() )
@ -688,12 +690,23 @@ public class DefaultLifecycleExecutor
{ {
Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration(); Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration();
Xpp3Dom mojoConfiguration = extractMojoConfiguration( executionConfiguration, mojoExecution.getMojoDescriptor() ); Xpp3Dom mojoConfiguration = extractMojoConfiguration( executionConfiguration, mojoDescriptor );
Xpp3Dom mergedConfiguration = mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
mojoExecution.setConfiguration( mergedConfiguration ); /*
* The model only contains the default configuration for those goals that are present in the plugin
* 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() ) )
{
Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration );
}
mojoExecution.setConfiguration( mojoConfiguration );
return; return;
} }
@ -702,20 +715,20 @@ public class DefaultLifecycleExecutor
if ( allowPluginLevelConfig ) if ( allowPluginLevelConfig )
{ {
Xpp3Dom defaultDom = convert( mojoExecution.getMojoDescriptor() ); Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
Xpp3Dom mojoDom = defaultDom; Xpp3Dom mojoConfiguration = defaultConfiguration;
if ( plugin != null && plugin.getConfiguration() != null ) if ( plugin != null && plugin.getConfiguration() != null )
{ {
Xpp3Dom projectDom = (Xpp3Dom) plugin.getConfiguration(); Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
projectDom = extractMojoConfiguration( projectDom, mojoExecution.getMojoDescriptor() ); pluginConfiguration = extractMojoConfiguration( pluginConfiguration, mojoDescriptor );
mojoDom = Xpp3Dom.mergeXpp3Dom( projectDom, defaultDom, Boolean.TRUE ); mojoConfiguration = Xpp3Dom.mergeXpp3Dom( pluginConfiguration, defaultConfiguration, Boolean.TRUE );
} }
mojoDom = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoDom ); mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
mojoExecution.setConfiguration( mojoDom ); mojoExecution.setConfiguration( mojoConfiguration );
} }
} }
@ -1170,7 +1183,7 @@ public class DefaultLifecycleExecutor
throw new LifecycleExecutionException( "Error getting default plugin information: ", e ); throw new LifecycleExecutionException( "Error getting default plugin information: ", e );
} }
return convert( mojoDescriptor ); return getMojoConfiguration( mojoDescriptor );
} }
public Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor ) public Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )