Author: jvanzyl
Date: Mon Jun 4 14:32:11 2007
New Revision: 544280
URL: http://svn.apache.org/viewvc?view=rev&rev=544280
Log:
o simplify the demo
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom1.xml
- copied unchanged from r544274,
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/pom2.xml
- copied unchanged from r544274,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/pom-with-ju-3.8.xml
Removed:
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
Modified:
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/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=544280&r1=544279&r2=544280
==============================================================================
---
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:32:11 2007
@@ -1,14 +1,5 @@
#!/bin/sh
-# 1. Go to the parent directory and call mvn deploy
-# 2. Go to the issue directory and call mvn eclipse:eclipse, the project is
now dependent on junit-3.7 as defined in the dependencyManagement of the parent
-# 3. Set your local repo in settings.xml to something else e.g.
<localRepository>/temp/repo-m2-local</localRepository>
-# 4. Go to the parent directory and change the version of junit to 3.8
-# 5. Call again mvn deploy, but Maven will now use the temporary local repo
for installation of the updated POM
-# 6. Go to the issue directory and call mvn eclipse:eclipse, the project is
now dependent on junit-3.8 as defined in the dependencyManagement of the parent
-# 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`
@@ -16,10 +7,16 @@
mvn="mvn"
repo="$HOME/maven-repo-local"
+# Remove commons-logging all together
rm -rf $repo/commons-logging
-( cd parent ; cp pom-with-ju-3.7.xml pom.xml ; $mvn deploy )
+# Deploy the parent POM in our file-based remote repository
+( cd parent ; $mvn -f pom1.xml deploy )
+# Run the compile phase for the child project. This will bring down
commons-logging 1.0.1
( cd issue; $mvn compile )
-( cd parent ; cp pom-with-ju-3.8.xml pom.xml ; $mvn deploy )
+# Deploy the parent POM with an update version of the commons-logging
dependency -> 1.0.2
+( cd parent ; $mvn -f pom2.xml deploy )
+# Move the original commons-loggings deps out of the way
mv $repo/commons-logging $repo/commons-logging-1.0.1
+# Run the child project again and the new version of commons-logging should
come down
( cd issue; $mvn compile )
