diff --git a/its/README.md b/its/README.md index 4cc36608e6..ea8d7fc1d4 100644 --- a/its/README.md +++ b/its/README.md @@ -24,7 +24,17 @@ Maven Core Integration Tests If you want to run the integration tests against a custom build of Maven use the following command: ``` -mvn clean install -Prun-its -Dmaven.repo.local=`pwd`/repo -DmavenDistro=/path/to/apache-maven-dist.zip +export MAVENCODEBASE= +``` + +You can choose to build the maven project from here with: +``` +mvn verify -P local-it -f "$MAVENCODEBASE" +``` + +Now run (don't forget to update the versions!) +``` +mvn clean install -Prun-its,embdedded -Dmaven.repo.local=`pwd`/repo -DmavenDistro="$MAVENCODEBASE\apache-maven\target\apache-maven--bin.zip" -DwrapperDistroDir="$MAVENCODEBASE\apache-maven\target" -DmavenWrapper="$MAVENCODEBASE\maven-wrapper\target\maven-wrapper-.jar" ``` or if behind a proxy diff --git a/its/run-its.bat b/its/run-its.bat index 00456942dc..ce055c192f 100644 --- a/its/run-its.bat +++ b/its/run-its.bat @@ -17,10 +17,15 @@ @REM under the License. @REM -@REM How JvZ runs the ITs from a clean slate if it would be on Windows - -mvn clean install -U -Prun-its,embedded -Dmaven.repo.local=%cd%\repo +@ECHO OFF +if "%MAVENCODEBASE%" == "" ( + echo Please set MAVENCODEBASE + @ECHO ON +) else ( + @ECHO ON + mvn verify -Plocal-it -f "%MAVENCODEBASE%" + mvn clean install -Prun-its,embdedded -Dmaven.repo.local="%cd%\repo" -DmavenDistro="%MAVENCODEBASE%\apache-maven\target\apache-maven-bin.zip" -DwrapperDistroDir="%MAVENCODEBASE%\apache-maven\target" -DmavenWrapper="%MAVENCODEBASE%\maven-wrapper\target\maven-wrapper.jar" +) @REM If behind a proxy try this.. - @REM mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\repo -Dproxy.host= -Dproxy.port= -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts= diff --git a/its/run-its.sh b/its/run-its.sh index d13fce614a..050a61737b 100755 --- a/its/run-its.sh +++ b/its/run-its.sh @@ -21,7 +21,13 @@ # How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ. -mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo +if [ -z "$MAVENCODEBASE" ] ; then + echo Please export MAVENCODEBASE +else + mvn verify -P local-it -f "$MAVENCODEBASE" + mvn clean test -Prun-its,embdedded -Dmaven.repo.local=`pwd`/repo -DmavenDistro="$MAVENCODEBASE\apache-maven\target\apache-maven-bin.zip" -DwrapperDistroDir="$MAVENCODEBASE\apache-maven\target" -DmavenWrapper="$MAVENCODEBASE\maven-wrapper\target\maven-wrapper.jar" +fi + # If behind a proxy try this