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

Artifacts containers now will inherit versions. This will occur before management rules are applied. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727614 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-12-18 01:45:13 +00:00
parent f67099266e
commit 61a5d19c4e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ 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 ) ) if ( 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

@ -56,9 +56,9 @@ public class PomConstructionTest
PomTestWrapper pom = new PomTestWrapper( model ); PomTestWrapper pom = new PomTestWrapper( model );
assertEquals( "maven-dependency-plugin", pom.getValue( "build/plugins[1]/artifactId" ) ); assertEquals( "maven-dependency-plugin", pom.getValue( "build/plugins[4]/artifactId" ) );
List executions = (List) pom.getValue( "build/plugins[1]/executions" ); List executions = (List) pom.getValue( "build/plugins[4]/executions" );
assertEquals( 7, executions.size() ); assertEquals( 7, executions.size() );
} }