You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/12/10 06:09:10 UTC
cvs commit: maven-components/maven-project/src/test-input/a/aa project.xml
jvanzyl 2003/12/09 21:09:10
Modified: maven-project/src/java/org/apache/maven/project Project.java
maven-project/src/test/org/apache/maven/project
DefaultProjectBuilderTest.java
maven-project/src/test-input project.xml
maven-project/src/test-input/a project.properties
project.xml
maven-project/src/test-input/a/aa project.xml
Log:
o added a test case which reveals a problem with recursive model
inheritance.
Revision Changes Path
1.14 +7 -1 maven-components/maven-project/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Project.java 9 Dec 2003 16:44:54 -0000 1.13
+++ Project.java 10 Dec 2003 05:09:10 -0000 1.14
@@ -559,6 +559,12 @@
if ( property == null && hasParent() )
{
+ System.out.println( "key = " + key );
+
+ System.out.println( "getParent() = " + getParent() );
+
+ System.out.println( "getParent().getId() = " + getParent().getId() );
+
property = getParent().getProperty( key );
}
1.16 +18 -2 maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultProjectBuilderTest.java 10 Dec 2003 03:32:48 -0000 1.15
+++ DefaultProjectBuilderTest.java 10 Dec 2003 05:09:10 -0000 1.16
@@ -144,10 +144,26 @@
// Test a property value from this project.
assertEquals( "aa", project.getProperty( "name" ) );
- // Test a property from parent project.
+ // Test a property value from parent project.
assertEquals( "guelph", project.getProperty( "place" ) );
- // Test a property from grand parent project.
+ // Test a property value from grand parent project.
assertEquals( "canada", project.getProperty( "country" ) );
+ }
+
+ // Recursive Model Inheritance
+
+ public void testModelInheritanceWithTwoLevelsOfInheritance()
+ throws Exception
+ {
+ File f = new File( basedir, "src/test-input/a/aa/project.xml" );
+
+ Project project = projectBuilder.build( f );
+
+ assertNotNull( "Test project cannot be null.", project );
+
+ assertNotNull( project.getParent().getParent() );
+
+ assertEquals( "2.0", project.getVersion() );
}
}
1.2 +2 -2 maven-components/maven-project/src/test-input/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test-input/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Dec 2003 15:39:50 -0000 1.1
+++ project.xml 10 Dec 2003 05:09:10 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
- <pomVersion>3</pomVersion>
- <currentVersion>1.0-beta-8</currentVersion>
+ <modelVersion>3</modelVersion>
+ <version>1.0-beta-8</version>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
1.2 +1 -0 maven-components/maven-project/src/test-input/a/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test-input/a/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 9 Dec 2003 13:56:24 -0000 1.1
+++ project.properties 10 Dec 2003 05:09:10 -0000 1.2
@@ -1 +1,2 @@
name = a
+place = guelph
1.2 +1 -1 maven-components/maven-project/src/test-input/a/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test-input/a/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Dec 2003 13:56:24 -0000 1.1
+++ project.xml 10 Dec 2003 05:09:10 -0000 1.2
@@ -4,7 +4,7 @@
<groupId>a</groupId>
<artifactId>a</artifactId>
<name>a</name>
- <currentVersion>1.0</currentVersion>
+ <version>1.0</version>
<dependencies>
<dependency>
1.2 +1 -30 maven-components/maven-project/src/test-input/a/aa/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test-input/a/aa/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Dec 2003 03:29:11 -0000 1.1
+++ project.xml 10 Dec 2003 05:09:10 -0000 1.2
@@ -4,35 +4,6 @@
<groupId>aa</groupId>
<artifactId>aa</artifactId>
<name>aa</name>
- <currentVersion>1.0</currentVersion>
-
- <dependencies>
- <dependency>
- <groupId>b</groupId>
- <artifactId>b</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>c</groupId>
- <artifactId>c</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>d</groupId>
- <artifactId>d</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>e</groupId>
- <artifactId>e</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>f</groupId>
- <artifactId>f</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
+ <version>2.0</version>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org