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

o don't let inherited executions from plugin management containers be appended, they need to be overridden if there is no execution id 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727623 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-12-18 03:16:52 +00:00
parent 61a5d19c4e
commit 2560c1e0bb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
View File

@ -301,23 +301,24 @@ public class PomTransformer
continue; continue;
} }
boolean processedExecutionWithoutId = false; boolean hasAtLeastOneWithoutId = true;
for ( ModelContainer executionContainer : executionContainers ) for ( ModelContainer executionContainer : executionContainers )
{ {
if ( !hasExecutionId( executionContainer ) ) if ( hasAtLeastOneWithoutId )
{ {
processedExecutionWithoutId = true; hasAtLeastOneWithoutId = hasExecutionId( executionContainer );
} }
else if ( !hasExecutionId( executionContainer ) && processedExecutionWithoutId )
if ( !hasAtLeastOneWithoutId && !hasExecutionId( executionContainer ) && executionContainers.indexOf( executionContainer ) > 0 )
{ {
removeProperties.addAll( executionContainer.getProperties() ); removeProperties.addAll( executionContainer.getProperties() );
} }
} }
} }
props.removeAll( removeProperties ); props.removeAll( removeProperties );
for(ModelEventListener listener : eventListeners) for(ModelEventListener listener : eventListeners)
{ {
ModelDataSource ds = new DefaultModelDataSource(); ModelDataSource ds = new DefaultModelDataSource();
@ -751,7 +752,7 @@ public class PomTransformer
private static boolean hasProjectUri( String projectUri, List<ModelProperty> modelProperties ) private static boolean hasProjectUri( String projectUri, List<ModelProperty> modelProperties )
{ {
for ( ModelProperty mp : modelProperties ) for ( ModelProperty mp : modelProperties )
{ {
if ( mp.getUri().equals( projectUri ) ) if ( mp.getUri().equals( projectUri ) )
{ {
return true; return true;