brett 2004/03/10 03:15:50
Modified: src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Project.java
src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
LegacyIdTest.java
Added: src/test/test-data/pom/extend Tag: MAVEN-1_0-BRANCH
base-id-only.xml test-id-override-groupid.xml
Log:
id inheritence compatibility
Revision Changes Path
No revision
No revision
1.91.4.14 +2 -2 maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.91.4.13
retrieving revision 1.91.4.14
diff -u -r1.91.4.13 -r1.91.4.14
--- Project.java 3 Mar 2004 10:34:02 -0000 1.91.4.13
+++ Project.java 10 Mar 2004 11:15:47 -0000 1.91.4.14
@@ -1552,7 +1552,7 @@
if ( groupId == null )
{
- groupId = parent.getGroupId();
+ groupId = parent.groupId;
}
if ( build == null )
No revision
No revision
1.1.2.1 +23 -0 maven/src/test/test-data/pom/extend/Attic/base-id-only.xml
1.1.2.1 +23 -0
maven/src/test/test-data/pom/extend/Attic/test-id-override-groupid.xml
No revision
No revision
1.1.2.3 +11 -1
maven/src/test/java/org/apache/maven/project/Attic/LegacyIdTest.java
Index: LegacyIdTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/Attic/LegacyIdTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LegacyIdTest.java 3 Mar 2004 10:34:02 -0000 1.1.2.2
+++ LegacyIdTest.java 10 Mar 2004 11:15:50 -0000 1.1.2.3
@@ -102,6 +102,16 @@
assertEquals( "check id", "base-groupId:extend-artifactId", p.getId() );
}
+ public void testExtendIdOverrideGroupId() throws Exception
+ {
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir"
),
+
"src/test/test-data/pom/extend/test-id-override-groupid.xml" ) );
+ assertEquals( "check id", "extend-artifactId:extend-artifactId", p.getId()
);
+ assertEquals( "check artifact id", "extend-artifactId", p.getArtifactId() );
+ assertEquals( "check group id", "extend-artifactId", p.getGroupId() );
+ assertEquals( "check id", "extend-artifactId:extend-artifactId", p.getId()
);
+ }
+
public void testExtendGroupIdAndArtifactId() throws Exception
{
Project p = MavenUtils.getProject( new File( System.getProperty( "basedir"
),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
