svn commit: r691093 - /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

[sisbell]

Author: sisbell
Date: Mon Sep  1 19:21:48 2008
New Revision: 691093

URL: http://svn.apache.org/viewvc?rev=691093&view=rev
Log:
Fix: Pulling from wrong source when querying execution containers. In some 
cases, led to wrong execution tag being deleted.

Modified:
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=691093&r1=691092&r2=691093&view=diff
==============================================================================
--- 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Mon Sep  1 19:21:48 2008
@@ -455,7 +455,7 @@
         }
 
        //Rule: Do not join plugin executions without ids
-       List<ModelProperty> removeProperties = new ArrayList<ModelProperty>();
+       Set<ModelProperty> removeProperties = new HashSet<ModelProperty>();
        ModelDataSource source = new DefaultModelDataSource();
        source.init( modelProperties, Arrays.asList( new 
ArtifactModelContainerFactory(), new IdModelContainerFactory() ) );
        List<ModelContainer> containers =  source.queryFor( 
ProjectUri.Build.Plugins.Plugin.xUri );
@@ -464,7 +464,7 @@
             executionSource.init( pluginContainer.getProperties(), 
Arrays.asList( new ArtifactModelContainerFactory(),
                     new IdModelContainerFactory() ) );
             List<ModelContainer> executionContainers =
-                    source.queryFor( 
ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri  );
+                    executionSource.queryFor( 
ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri  );
             if(executionContainers.size() < 2)
             {
                 break;