Author: jdcasey
Date: Thu Jul 28 20:07:56 2005
New Revision: 226330
URL: http://svn.apache.org/viewcvs?rev=226330&view=rev
Log:
o Changed the it scripts to remove the $MAVEN_OPTS from the verifier launch
line, so that we can remotely debug an integration test execution (rather than
getting stuck on the verifier execution itself)
o Added lines in it0015 and it0020 prebuild-hooks to remove the IT plugins
before executing, to avoid weird, intermittent Zip exceptions.
Modified:
maven/components/trunk/maven-core-it/it0015/prebuild-hook.txt
maven/components/trunk/maven-core-it/it0020/prebuild-hook.txt
maven/components/trunk/maven-core-it/maven-core-it.bat
maven/components/trunk/maven-core-it/maven-core-it.sh
Modified: maven/components/trunk/maven-core-it/it0015/prebuild-hook.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0015/prebuild-hook.txt?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0015/prebuild-hook.txt (original)
+++ maven/components/trunk/maven-core-it/it0015/prebuild-hook.txt Thu Jul 28
20:07:56 2005
@@ -1 +1,2 @@
+rm
${artifact:org.apache.maven.plugins:maven-it0015-plugin:1.0-SNAPSHOT:maven-plugin}
rm target/out.txt
Modified: maven/components/trunk/maven-core-it/it0020/prebuild-hook.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0020/prebuild-hook.txt?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0020/prebuild-hook.txt (original)
+++ maven/components/trunk/maven-core-it/it0020/prebuild-hook.txt Thu Jul 28
20:07:56 2005
@@ -1 +1,2 @@
+rm
${artifact:org.apache.maven.plugins:maven-it0020-plugin:1.0-SNAPSHOT:maven-plugin}
rm target/out.txt
Modified: maven/components/trunk/maven-core-it/maven-core-it.bat
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.bat?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.bat (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.bat Thu Jul 28 20:07:56
2005
@@ -20,5 +20,5 @@
@REM NOTE: for simplicity, only Windows NT/2000/XP is current supported
@REM This also assumes that M2_HOME and JAVA_HOME are set, which are verified
in the bootstrap script only
-"%JAVA_HOME%\bin\java.exe" -Dmaven.home="%M2_HOME%" %MAVEN_OPTS% -cp
"..\maven-core-it-verifier\target\maven-core-it-verifier-1.0.jar"
org.apache.maven.it.Verifier %*
+"%JAVA_HOME%\bin\java.exe" -Dmaven.home="%M2_HOME%" -cp
"..\maven-core-it-verifier\target\maven-core-it-verifier-1.0.jar"
org.apache.maven.it.Verifier %*
Modified: maven/components/trunk/maven-core-it/maven-core-it.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.sh?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.sh (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.sh Thu Jul 28 20:07:56
2005
@@ -23,5 +23,6 @@
jvm_m2_home="-Dmaven.home=$M2_HOME"
fi
-java "$jvm_m2_home" $MAVEN_OPTS -cp "$cp" $verifier $@
+#java "$jvm_m2_home" $MAVEN_OPTS -cp "$cp" $verifier $@
+java "$jvm_m2_home" -cp "$cp" $verifier $@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
