You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/07 15:03:08 UTC
svn commit: r732344 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Author: sisbell
Date: Wed Jan 7 06:03:06 2009
New Revision: 732344
URL: http://svn.apache.org/viewvc?rev=732344&view=rev
Log:
Fix: MNG-3938
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.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=732344&r1=732343&r2=732344&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 Jan 7 06:03:06 2009
@@ -232,11 +232,27 @@
for(ModelContainer a : managementExecutionContainers)
{
+ boolean hasId = false;
+ for(ModelProperty mp : a.getProperties()) {
+ if(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.Executions.Execution.id)) {
+ hasId = true;
+ break;
+ }
+ }
+
+ ModelContainer c = a;
+ if(!hasId) {
+ List<ModelProperty> listWithId = new ArrayList<ModelProperty>(a.getProperties());
+ listWithId.add(1, new ModelProperty(ProjectUri.Build.Plugins.Plugin.Executions.Execution.id, "default"));
+ c = new IdModelContainerFactory().create(listWithId);
+ }
+
+
for(ModelContainer b : pluginExecutionContainers)
{
- if(b.containerAction(a).equals(ModelContainerAction.JOIN))
+ if(b.containerAction(c).equals(ModelContainerAction.JOIN))
{
- source.join(b, a);
+ source.join(b, c);
joinedExecutionContainers.add(a);
}
}
@@ -272,6 +288,7 @@
ModelTransformerContext.sort(a.getProperties(), ProjectUri.Build.Plugins.Plugin.Executions.xUri));
}
}
+
}
}
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=732344&r1=732343&r2=732344&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Jan 7 06:03:06 2009
@@ -243,7 +243,7 @@
assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
}
- /* FIXME: cf. MNG-3938
+ /* FIXME: cf. MNG-3938 */
public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
throws Exception
{
@@ -252,7 +252,7 @@
assertEquals( "child-default", pom.getValue( "build/plugins[1]/executions[@id='default']/phase" ) );
assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
}
- //*/
+
/* FIXME: cf. MNG-3906
public void testOrderOfMergedPluginDependenciesWithoutPluginManagement()