You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/18 20:42:24 UTC
svn commit: r718690 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3843/ resources/mng-3843/test-3/
resources/mng-3843/test-3/sub-parent/
resources/mng-3843/test-3/sub-parent/child-a/ resource...
Author: bentmann
Date: Tue Nov 18 11:42:23 2008
New Revision: 718690
URL: http://svn.apache.org/viewvc?rev=718690&view=rev
Log:
o Extended IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=718690&r1=718689&r2=718690&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java Tue Nov 18 11:42:23 2008
@@ -53,6 +53,7 @@
verifier.deleteDirectory( "test-1/target" );
verifier.deleteDirectory( "test-2/target" );
verifier.deleteDirectory( "test-2/child-1/target" );
+ verifier.deleteDirectory( "test-3/sub-parent/child-a/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -162,6 +163,10 @@
assertEquals( "parent-dep-b", props.getProperty( "project.dependencies.0.artifactId" ) );
assertEquals( "1", props.getProperty( "project.dependencyManagement.dependencies" ) );
assertEquals( "parent-dep-a", props.getProperty( "project.dependencyManagement.dependencies.0.artifactId" ) );
+
+ basedir = new File( verifier.getBasedir(), "test-3/sub-parent/child-a" );
+ props = verifier.loadProperties( "test-3/sub-parent/child-a/target/pom.properties" );
+ assertEquals( "../pom.xml", props.getProperty( "project.originalModel.parent.relativePath" ) );
}
private void assertPathEquals( File basedir, String expected, String actual )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/pom.xml?rev=718690&r1=718689&r2=718690&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/pom.xml Tue Nov 18 11:42:23 2008
@@ -35,5 +35,6 @@
<modules>
<module>test-1</module>
<module>test-2</module>
+ <module>test-3/top-parent</module>
</modules>
</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml?rev=718690&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml Tue Nov 18 11:42:23 2008
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ This POM relies on the (non-inherited) default value for <relativePath> when referring to its parent.
+ -->
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>sub-parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>child-a</artifactId>
+ <version>0.1</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>eval</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/pom.properties</outputFile>
+ <expressions>
+ <expression>project/originalModel/parent</expression>
+ </expressions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/child-a/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml?rev=718690&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml Tue Nov 18 11:42:23 2008
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ This parent POM uses a non-default value for <relativePath> when referring to its parent.
+ -->
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>top-parent</artifactId>
+ <version>0.1</version>
+ <relativePath>../top-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>sub-parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child-a</module>
+ </modules>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/sub-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml?rev=718690&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml Tue Nov 18 11:42:23 2008
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ This parent POM exists merely to have another parent POM inherit from it.
+ -->
+
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>top-parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>../sub-parent</module>
+ </modules>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/test-3/top-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision