svn commit: r931125 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: inheritance/DefaultInheritanceAssembler.java merge/MavenModelMerger.java

[bentmann]

Author: bentmann
Date: Tue Apr  6 12:44:16 2010
New Revision: 931125

URL: http://svn.apache.org/viewvc?rev=931125&view=rev
Log:
[MNG-2103] Inheritance of <plugin> overrides that of <execution>

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java?rev=931125&r1=931124&r2=931125&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
 Tue Apr  6 12:44:16 2010
@@ -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>>();

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=931125&r1=931124&r2=931125&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 Tue Apr  6 12:44:16 2010
@@ -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 );