Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: MNG-3943 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-01-09 13:42:37 +00:00
parent b4931fef14
commit 647a0112cc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
View File

@ -75,6 +75,8 @@ public final class ArtifactModelContainerFactory
private String scope; private String scope;
private String classifier; private String classifier;
private String uri;
private List<ModelProperty> properties; private List<ModelProperty> properties;
@ -95,7 +97,7 @@ public final class ArtifactModelContainerFactory
{ {
this.properties = new ArrayList<ModelProperty>( properties ); this.properties = new ArrayList<ModelProperty>( properties );
this.properties = Collections.unmodifiableList( this.properties ); this.properties = Collections.unmodifiableList( this.properties );
String uri = findBaseUriFrom( this.properties ); uri = findBaseUriFrom( this.properties );
for ( ModelProperty mp : this.properties ) for ( ModelProperty mp : this.properties )
{ {
@ -193,7 +195,8 @@ public final class ArtifactModelContainerFactory
if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type ) if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type )
&& c.classifier.equals( classifier )) && 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; return ModelContainerAction.JOIN;
} }

4
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
View File

@ -166,14 +166,14 @@ public class PomConstructionTest
assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
} }
/* FIXME: cf. MNG-3943 /* FIXME: cf. MNG-3943*/
public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions() public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
throws Exception throws Exception
{ {
PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" ); PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" );
assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
} }
//*/
public void testInterpolationWithXmlMarkup() public void testInterpolationWithXmlMarkup()
throws Exception throws Exception