Author: jvanzyl
Date: Mon Jun 4 14:25:15 2007
New Revision: 544274
URL: http://svn.apache.org/viewvc?view=rev&rev=544274
Log: (empty)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.7.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/pom.xml?view=diff&rev=544274&r1=544273&r2=544274
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/pom.xml
Mon Jun 4 14:25:15 2007
@@ -18,8 +18,8 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.7.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.7.xml?view=diff&rev=544274&r1=544273&r2=544274
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.7.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.7.xml
Mon Jun 4 14:25:15 2007
@@ -18,9 +18,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.7</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml?view=diff&rev=544274&r1=544273&r2=544274
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml
Mon Jun 4 14:25:15 2007
@@ -15,12 +15,13 @@
<build/>
<profiles/>
<reporting/>
+
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh?view=diff&rev=544274&r1=544273&r2=544274
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh
Mon Jun 4 14:25:15 2007
@@ -9,16 +9,17 @@
# 7. Restore your settings.xml
# 8. Call mvn eclipse:eclipse again for the issue, the project is still
dependent on junit-3.7 the available newer version of the snapshot parent is
ignored
+# We want to test that after changing the parent POM which is a SNAPSHOT, it
is used for any children.
dir=`pwd`
mvn="mvn"
repo="$HOME/maven-repo-local"
-rm -rf $repo/junit
+rm -rf $repo/commons-logging
( cd parent ; cp pom-with-ju-3.7.xml pom.xml ; $mvn deploy )
( cd issue; $mvn compile )
( cd parent ; cp pom-with-ju-3.8.xml pom.xml ; $mvn deploy )
-mv $repo/junit $repo/junit-3.7
+mv $repo/commons-logging $repo/commons-logging-1.0.1
( cd issue; $mvn compile )