From 445adba690b08d4182f911d2f5414c63e03b7091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Mon, 11 Oct 2021 23:48:07 +0200 Subject: [PATCH] [MNG-6914] update wrapper distro directory, now apache-maven-wrapper --- its/run-its.bat | 2 +- its/run-its.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/its/run-its.bat b/its/run-its.bat index 063d53685c..4463230ac1 100644 --- a/its/run-its.bat +++ b/its/run-its.bat @@ -32,7 +32,7 @@ CALL :normalizePath %MAVENCODEBASE% CALL mvn clean verify -DdistributionFileName=${project.artifactId} -f "%_MAVENCODEBASE%" || exit /B 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 + 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-wrapper\target" -DmavenWrapper="%_MAVENCODEBASE%\maven-wrapper\target\maven-wrapper.jar" || exit /B ) 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 ) diff --git a/its/run-its.sh b/its/run-its.sh index c054cb2319..7c2528e3ab 100755 --- a/its/run-its.sh +++ b/its/run-its.sh @@ -31,7 +31,7 @@ else esac mvn clean verify -P versionlessMavenDist -f "$MAVENCODEBASE" || exit $? if [ -f "$MAVENCODEBASE/maven-wrapper/target/maven-wrapper.jar" ] ; then - mvn clean install -Prun-its,embedded -Dmaven.repo.local="`pwd`/repo" -DmavenDistro="$MAVENCODEBASE/apache-maven/target/apache-maven-bin.zip" -DwrapperDistroDir="$MAVENCODEBASE/apache-maven/target" -DmavenWrapper="$MAVENCODEBASE/maven-wrapper/target/maven-wrapper.jar" || exit $? + mvn clean install -Prun-its,embedded -Dmaven.repo.local="`pwd`/repo" -DmavenDistro="$MAVENCODEBASE/apache-maven/target/apache-maven-bin.zip" -DwrapperDistroDir="$MAVENCODEBASE/apache-maven-wrapper/target" -DmavenWrapper="$MAVENCODEBASE/maven-wrapper/target/maven-wrapper.jar" || exit $? else mvn clean install -Prun-its,embedded,!maven-wrapper -Dmaven.repo.local="`pwd`/repo" -DmavenDistro="$MAVENCODEBASE/apache-maven/target/apache-maven-bin.zip" || exit $? fi