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/06/12 09:56:26 UTC
[maven-integration-testing] branch MNG-6939 updated: [MNG-6939] Fix
for Powershell
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6939
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/MNG-6939 by this push:
new 0e4e39f [MNG-6939] Fix for Powershell
0e4e39f is described below
commit 0e4e39fae9546bf339a0737b0aa4562dfa91cfe2
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Jun 12 11:56:17 2020 +0200
[MNG-6939] Fix for Powershell
---
run-its.bat | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/run-its.bat b/run-its.bat
index eed57ea..b4eaaa0 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -17,16 +17,16 @@
@REM under the License.
@REM
@ECHO OFF
-if "%MAVENCODEBASE%" == "" (
- @ECHO Please set MAVENCODEBASE
-) else (
- CALL :normalizePath %MAVENCODEBASE%
-
- CALL :maven && CALL :maven-integration-testing
-
+@IF "%MAVENCODEBASE%"=="" (
+ @ECHO Please SET MAVENCODEBASE / $env:MAVENCODEBASE
+ @GOTO :eof
)
-@goto :eof
+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>
@@ -34,12 +34,10 @@ if "%MAVENCODEBASE%" == "" (
:: ========== FUNCTIONS ==========
:maven
- CALL mvn verify -DdistributionFileName=${project.artifactId} -f "%MAVENCODEBASE%" || exit /B
+ CALL mvn verify -DdistributionFileName=${project.artifactId} -f "%_MAVENCODEBASE%" || exit /B
:maven-integration-testing
- 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
+ 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
:normalizePath
- setlocal
- SET MAVENCODEBASE=%~dpfn1
- endlocal
+ SET _MAVENCODEBASE=%~dpfn1