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

Corrected goal and plugin configuration injection (from managed info). 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-04-28 04:21:11 +00:00
parent a5c141c146
commit dfb2dfcaa1
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
View File

@ -18,6 +18,7 @@ package org.apache.maven.project.injection;
import org.apache.maven.model.Dependency; import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Goal;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin; import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement; import org.apache.maven.model.PluginManagement;
@ -89,18 +90,49 @@ public class DefaultModelDefaultsInjector
{ {
plugin.setVersion( def.getVersion() ); plugin.setVersion( def.getVersion() );
} }
Map defaultGoals = new TreeMap();
List defGoalList = def.getGoals();
if ( defGoalList != null )
{
for ( Iterator it = defGoalList.iterator(); it.hasNext(); )
{
Goal defaultGoal = (Goal) it.next();
defaultGoals.put( defaultGoal.getId(), defaultGoal );
}
}
List pluginGoals = plugin.getGoals(); List pluginGoals = plugin.getGoals();
if( pluginGoals == null || pluginGoals.isEmpty() )
if ( pluginGoals != null )
{ {
plugin.setGoals( def.getGoals() ); for ( Iterator it = pluginGoals.iterator(); it.hasNext(); )
{
Goal pluginGoal = (Goal) it.next();
Goal defaultGoal = (Goal) defaultGoals.get( pluginGoal.getId() );
if ( defaultGoal != null )
{
Xpp3Dom pluginGoalConfig = (Xpp3Dom) pluginGoal.getConfiguration();
Xpp3Dom defaultGoalConfig = (Xpp3Dom) defaultGoal.getConfiguration();
pluginGoalConfig = Xpp3Dom.mergeXpp3Dom( pluginGoalConfig, defaultGoalConfig );
pluginGoal.setConfiguration( pluginGoalConfig );
}
}
} }
Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration(); Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
if( pluginConfiguration == null ) Xpp3Dom defaultConfiguration = (Xpp3Dom) def.getConfiguration();
{
plugin.setConfiguration( def.getConfiguration() ); pluginConfiguration = Xpp3Dom.mergeXpp3Dom( pluginConfiguration, defaultConfiguration );
}
plugin.setConfiguration( pluginConfiguration );
} }
private void injectDependencyDefaults( List dependencies, DependencyManagement dependencyManagement ) private void injectDependencyDefaults( List dependencies, DependencyManagement dependencyManagement )