From 647a0112cc8cce9f6f388a8bd39cad2aef85049f Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Fri, 9 Jan 2009 13:42:37 +0000 Subject: [PATCH] Fix: MNG-3943 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68 --- .../project/builder/ArtifactModelContainerFactory.java | 7 +++++-- .../apache/maven/project/builder/PomConstructionTest.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java index b045272b9e..f46a3e021c 100644 --- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java +++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java @@ -75,6 +75,8 @@ private static class ArtifactModelContainer private String scope; private String classifier; + + private String uri; private List properties; @@ -95,7 +97,7 @@ private ArtifactModelContainer( List properties ) { this.properties = new ArrayList( properties ); this.properties = Collections.unmodifiableList( this.properties ); - String uri = findBaseUriFrom( this.properties ); + uri = findBaseUriFrom( this.properties ); for ( ModelProperty mp : this.properties ) { @@ -193,7 +195,8 @@ public ModelContainerAction containerAction( ModelContainer modelContainer ) if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type ) && c.classifier.equals( classifier )) { - if ( c.version.equals( version ) || version.equals("") || c.version.equals("")) + if ( uri.startsWith(ProjectUri.Build.Plugins.xUri) || c.version.equals( version ) + || version.equals("") || c.version.equals("")) { return ModelContainerAction.JOIN; } 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 03a7c4c942..636996ac76 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 @@ -166,14 +166,14 @@ public void testMergeOfPluginExecutionsWhenChildInheritsPluginVersion() assertEquals( 4, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); } - /* FIXME: cf. MNG-3943 + /* FIXME: cf. MNG-3943*/ public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions() throws Exception { PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" ); assertEquals( 4, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); } - //*/ + public void testInterpolationWithXmlMarkup() throws Exception