From f3c978e962a3de435575690d521bf1c4448a6065 Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Wed, 7 Jan 2009 14:03:06 +0000 Subject: [PATCH] Fix: MNG-3938 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/project/builder/PomTransformer.java | 21 +++++++++++++++++-- .../project/builder/PomConstructionTest.java | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java index b08dafed70..6bf3738425 100644 --- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java +++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java @@ -232,11 +232,27 @@ public final DomainModel transformToDomainModel( List properties, 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 listWithId = new ArrayList(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 @@ public final DomainModel transformToDomainModel( List properties, ModelTransformerContext.sort(a.getProperties(), ProjectUri.Build.Plugins.Plugin.Executions.xUri)); } } + } } } diff --git a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java index 6b86a2ebbc..0b1a1e0d92 100644 --- a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java @@ -243,7 +243,7 @@ public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement() 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 @@ public void testOverridingOfInheritedPluginExecutionsWithPluginManagement() 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()