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

o Fixed merging of plugin executions 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773212 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-09 12:15:26 +00:00
parent a5cd3ceb08
commit 0c5208ac25
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,14 +474,14 @@ public class MavenModelMerger
Map<Object, PluginExecution> merged = Map<Object, PluginExecution> merged =
new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 ); 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(); ) for ( Iterator<PluginExecution> it = src.iterator(); it.hasNext(); )
{ {
PluginExecution element = it.next(); PluginExecution element = it.next();
Object key = getPluginExecutionKey( element ); if ( sourceDominant || ( source.isInherited() && element.isInherited() ) )
merged.put( key, element ); {
Object key = getPluginExecutionKey( element );
merged.put( key, element );
}
} }
for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext(); ) for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext(); )