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/11 21:28:07 UTC
[maven-integration-testing] branch MNG-6939 updated: [MNG-6939] ITs
fail when MAVENCODEBASE is relative (Windows) Stop script if core fails
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 3d929f6 [MNG-6939] ITs fail when MAVENCODEBASE is relative (Windows) Stop script if core fails
3d929f6 is described below
commit 3d929f60f8a2137951e10c6c83f714dca72f6dc8
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Jun 11 23:27:55 2020 +0200
[MNG-6939] ITs fail when MAVENCODEBASE is relative (Windows)
Stop script if core fails
---
run-its.bat | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/run-its.bat b/run-its.bat
index ce055c1..eed57ea 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -16,16 +16,30 @@
@REM specific language governing permissions and limitations
@REM under the License.
@REM
-
@ECHO OFF
if "%MAVENCODEBASE%" == "" (
- echo Please set MAVENCODEBASE
- @ECHO ON
+ @ECHO Please set MAVENCODEBASE
) 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"
+ 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 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
+
+:normalizePath
+ setlocal
+ SET MAVENCODEBASE=%~dpfn1
+ endlocal