You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/26 18:14:12 UTC

[maven-integration-testing] branch master updated: Update documentation on how to run ITs including tests for maven-wrapper

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e5a51c  Update documentation on how to run ITs including tests for maven-wrapper
6e5a51c is described below

commit 6e5a51ce20d49a13134749ce67ef4b0c1d6fa31e
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue May 26 20:14:01 2020 +0200

    Update documentation on how to run ITs including tests for maven-wrapper
---
 README.md   | 12 +++++++++++-
 run-its.bat | 13 +++++++++----
 run-its.sh  |  8 +++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4cc3660..ea8d7fc 100644
--- a/README.md
+++ b/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=<path-to-maven-codebase>
+```
+
+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-<VERSION>-bin.zip" -DwrapperDistroDir="$MAVENCODEBASE\apache-maven\target" -DmavenWrapper="$MAVENCODEBASE\maven-wrapper\target\maven-wrapper-<VERSION>.jar"
 ```
 
 or if behind a proxy
diff --git a/run-its.bat b/run-its.bat
index 0045694..ce055c1 100644
--- a/run-its.bat
+++ b/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=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>
diff --git a/run-its.sh b/run-its.sh
index d13fce6..050a617 100755
--- a/run-its.sh
+++ b/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