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

override with goal configuration if it exists 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163618 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-19 00:22:28 +00:00
parent 2e7b575246
commit f5605e5327
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -28,6 +28,7 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter; import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.GoalExecutionException; import org.apache.maven.lifecycle.GoalExecutionException;
import org.apache.maven.model.Goal;
import org.apache.maven.model.Repository; import org.apache.maven.model.Repository;
import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents; import org.apache.maven.monitor.event.MavenEvents;
@ -545,7 +546,25 @@ public class DefaultPluginManager
// TODO: groupID not handled // TODO: groupID not handled
if ( pluginId.equals( plugin.getArtifactId() ) ) if ( pluginId.equals( plugin.getArtifactId() ) )
{ {
return CollectionUtils.mergeMaps( plugin.getConfiguration(), map ); map = CollectionUtils.mergeMaps( plugin.getConfiguration(), map );
// TODO: much less of this magic is needed - make the mojoDescriptor just store the first and second part
int index = goalId.indexOf( ':' );
if ( index >= 0 )
{
String goalName = goalId.substring( index + 1 );
for ( Iterator j = plugin.getGoals().iterator(); j.hasNext(); )
{
Goal goal = (Goal) j.next();
if ( goal.getId().equals( goalName ) )
{
map = CollectionUtils.mergeMaps( goal.getConfiguration(), map );
break;
}
}
}
return map;
} }
} }
} }