You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/12/17 22:25:46 UTC
svn commit: r727516 -
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
Author: jvanzyl
Date: Wed Dec 17 13:25:46 2008
New Revision: 727516
URL: http://svn.apache.org/viewvc?rev=727516&view=rev
Log:
MNG-3916: fixing the joining of executions in plugin containers.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=727516&r1=727515&r2=727516&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Wed Dec 17 13:25:46 2008
@@ -301,24 +301,23 @@
continue;
}
- boolean hasAtLeastOneWithoutId = true;
+ boolean processedExecutionWithoutId = false;
for ( ModelContainer executionContainer : executionContainers )
{
- if ( hasAtLeastOneWithoutId )
+ if ( !hasExecutionId( executionContainer ) )
{
- hasAtLeastOneWithoutId = hasExecutionId( executionContainer );
+ processedExecutionWithoutId = true;
}
-
- if ( !hasAtLeastOneWithoutId && !hasExecutionId( executionContainer ) && executionContainers.indexOf( executionContainer ) > 0 )
+ else if ( !hasExecutionId( executionContainer ) && processedExecutionWithoutId )
{
removeProperties.addAll( executionContainer.getProperties() );
- }
+ }
}
}
props.removeAll( removeProperties );
-
+
for(ModelEventListener listener : eventListeners)
{
ModelDataSource ds = new DefaultModelDataSource();
@@ -752,7 +751,7 @@
private static boolean hasProjectUri( String projectUri, List<ModelProperty> modelProperties )
{
for ( ModelProperty mp : modelProperties )
- {
+ {
if ( mp.getUri().equals( projectUri ) )
{
return true;