diff --git a/its/run-its.bat b/its/run-its.bat index 9bdb4fd9ca..063d53685c 100644 --- a/its/run-its.bat +++ b/its/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= -Dproxy.port= -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts= :: ========== 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