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

[MNG-2103] Inheritance of <plugin> overrides that of <execution> 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931125 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-04-06 12:44:16 +00:00
parent 37a0e64aa0
commit 997c3110c6
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
View File

@ -123,16 +123,14 @@ public class DefaultInheritanceAssembler
for ( Plugin element : src )
{
Object key = getPluginKey( element );
if ( element.isInherited() )
{
// NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions as well
Plugin plugin = new Plugin();
plugin.setGroupId( element.getGroupId() );
plugin.setArtifactId( element.getArtifactId() );
mergePlugin( plugin, element, sourceDominant, context );
master.put( key, plugin );
}
// NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions
Plugin plugin = new Plugin();
plugin.setGroupId( element.getGroupId() );
plugin.setArtifactId( element.getArtifactId() );
mergePlugin( plugin, element, sourceDominant, context );
master.put( key, plugin );
}
Map<Object, List<Plugin>> predecessors = new LinkedHashMap<Object, List<Plugin>>();

2
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -470,7 +470,7 @@ public class MavenModelMerger
for ( PluginExecution element : src )
{
if ( sourceDominant || ( source.isInherited() && element.isInherited() ) )
if ( sourceDominant || ( element.getInherited() != null ? element.isInherited() : source.isInherited() ) )
{
Object key = getPluginExecutionKey( element );
merged.put( key, element );