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 2021/05/16 21:55:38 UTC
[maven-integration-testing] branch master updated: Simplify and fix
script on Windows
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 91a7aa7 Simplify and fix script on Windows
91a7aa7 is described below
commit 91a7aa7cc6b1254aad18e51883212733b5912474
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun May 16 23:55:21 2021 +0200
Simplify and fix script on Windows
---
run-its.bat | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/run-its.bat b/run-its.bat
index 9bdb4fd..063d536 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -24,25 +24,20 @@
CALL :normalizePath %MAVENCODEBASE%
-CALL :maven && CALL :maven-integration-testing
-
-@GOTO :eof
-
@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>
:: ========== FUNCTIONS ==========
-:maven
- CALL mvn clean verify -DdistributionFileName=${project.artifactId} -f "%_MAVENCODEBASE%" || exit /B
+CALL mvn clean verify -DdistributionFileName=${project.artifactId} -f "%_MAVENCODEBASE%" || exit /B
-:maven-integration-testing
if exist "%_MAVENCODEBASE%\maven-wrapper\target\maven-wrapper.jar" (
CALL mvn clean install -Prun-its,embedded -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" || exit /B
-)
-else (
+) else (
CALL mvn clean install -Prun-its,embedded,!maven-wrapper -Dmaven.repo.local="%cd%\repo" -DmavenDistro="%_MAVENCODEBASE%\apache-maven\target\apache-maven-bin.zip" || exit /B
)
+@GOTO :eof
+
:normalizePath
SET _MAVENCODEBASE=%~dpfn1