Author: bentmann
Date: Sat May 9 12:15:26 2009
New Revision: 773212
URL: http://svn.apache.org/viewvc?rev=773212&view=rev
Log:
o Fixed merging of plugin executions
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=773212&r1=773211&r2=773212&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Sat May 9 12:15:26 2009
@@ -474,14 +474,14 @@
Map<Object, PluginExecution> merged =
new LinkedHashMap<Object, PluginExecution>( ( src.size() +
tgt.size() ) * 2 );
- // FIXME: This needs to consider the <inherited> flag. If this is
not detected by a UT/IT, we might want to
- // create one...
-
for ( Iterator<PluginExecution> it = src.iterator(); it.hasNext();
)
{
PluginExecution element = it.next();
- Object key = getPluginExecutionKey( element );
- merged.put( key, element );
+ if ( sourceDominant || ( source.isInherited() &&
element.isInherited() ) )
+ {
+ Object key = getPluginExecutionKey( element );
+ merged.put( key, element );
+ }
}
for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext();
)
