[MNG-6939] ITs fail when MAVENCODEBASE is relative (Windows)
diff --git a/run-its.bat b/run-its.bat
index ce055c1..a65e646 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -16,16 +16,28 @@
@REM specific language governing permissions and limitations
@REM under the License.
@REM
-
@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"
+@IF "%MAVENCODEBASE%"=="" (
+ @ECHO Please SET MAVENCODEBASE / $env:MAVENCODEBASE
+ @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>
+
+:: ========== 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
+ SET _MAVENCODEBASE=%~dpfn1
