From 5a2a792a5c24097d58c45c7b3e650647eca1319a Mon Sep 17 00:00:00 2001 From: Kipchumba Bett Date: Mon, 22 Apr 2024 18:00:44 +0300 Subject: [PATCH] OZ-464: Update maven wrapper distribution to `v3.3.0`. (#65) --- .../scripts/.mvn/wrapper/maven-wrapper.jar | Bin 62547 -> 63029 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../projects/it-basic/reference/scripts/mvnw | 256 ++++++++++-------- .../it-basic/reference/scripts/mvnw.cmd | 21 +- .../it-basic/reference/scripts/mvnwDebug | 2 +- .../it-basic/reference/scripts/mvnwDebug.cmd | 2 +- 6 files changed, 154 insertions(+), 129 deletions(-) diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.jar b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.jar index cb28b0e37c7d206feb564310fdeec0927af4123a..716422558d4bd975382c136a1038a18a88157dce 100644 GIT binary patch delta 17689 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 diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.properties b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.properties index e70e7bc..577f635 100644 --- a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.properties +++ b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw index 8d937f4..1fdbaf2 100755 --- a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw +++ b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 +# Apache Maven Wrapper startup batch script, version 3.3.0 # # Required ENV vars: # ------------------ @@ -33,75 +33,84 @@ # MAVEN_SKIP_RC - flag to disable loading of mavenrc files # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then +if [ -z "$MAVEN_SKIP_RC" ]; then - if [ -f /usr/local/etc/mavenrc ] ; then + if [ -f /usr/local/etc/mavenrc ]; then . /usr/local/etc/mavenrc fi - if [ -f /etc/mavenrc ] ; then + if [ -f /etc/mavenrc ]; then . /etc/mavenrc fi - if [ -f "$HOME/.mavenrc" ] ; then + if [ -f "$HOME/.mavenrc" ]; then . "$HOME/.mavenrc" fi fi # OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; +cygwin=false +darwin=false mingw=false case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)" + export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home" + export JAVA_HOME fi - ;; + fi + ;; esac -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then JAVA_HOME=$(java-config --jre-home) fi fi # For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") fi # For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +if $mingw; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ + && JAVA_HOME="$( + cd "$JAVA_HOME" || ( + echo "cannot cd into $JAVA_HOME." >&2 + exit 1 + ) + pwd + )" fi if [ -z "$JAVA_HOME" ]; then javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then # readlink(1) is not available as standard on Solaris 10. readLink=$(which readlink) if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + if $darwin; then + javaHome="$(dirname "$javaExecutable")" + javaExecutable="$(cd "$javaHome" && pwd -P)/javac" else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" + javaExecutable="$(readlink -f "$javaExecutable")" fi - javaHome="$(dirname "\"$javaExecutable\"")" + javaHome="$(dirname "$javaExecutable")" javaHome=$(expr "$javaHome" : '\(.*\)/bin') JAVA_HOME="$javaHome" export JAVA_HOME @@ -109,52 +118,60 @@ if [ -z "$JAVA_HOME" ]; then fi fi -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" else JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + JAVACMD="$( + \unset -f command 2>/dev/null + \command -v java + )" fi fi -if [ ! -x "$JAVACMD" ] ; then +if [ ! -x "$JAVACMD" ]; then echo "Error: JAVA_HOME is not defined correctly." >&2 echo " We cannot execute $JAVACMD" >&2 exit 1 fi -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." >&2 fi # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" >&2 return 1 fi basedir="$1" wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then basedir=$wdir break fi # workaround for JBEAP-8937 (on Solaris 10/Sparc) if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) + wdir=$( + cd "$wdir/.." || exit 1 + pwd + ) fi # end of workaround done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + printf '%s' "$( + cd "$basedir" || exit 1 + pwd + )" } # concatenates all lines of a file @@ -165,7 +182,7 @@ concat_lines() { # enabled. Otherwise, we may read lines that are delimited with # \r\n and produce $'-Xarg\r' rather than -Xarg due to word # splitting rules. - tr -s '\r\n' ' ' < "$1" + tr -s '\r\n' ' ' <"$1" fi } @@ -177,10 +194,11 @@ log() { BASE_DIR=$(find_maven_basedir "$(dirname "$0")") if [ -z "$BASE_DIR" ]; then - exit 1; + exit 1 fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +export MAVEN_PROJECTBASEDIR log "$MAVEN_PROJECTBASEDIR" ########################################################################################## @@ -189,63 +207,66 @@ log "$MAVEN_PROJECTBASEDIR" ########################################################################################## wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" + log "Found $wrapperJarPath" else - log "Couldn't find $wrapperJarPath, downloading it ..." + log "Couldn't find $wrapperJarPath, downloading it ..." - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in wrapperUrl) + wrapperUrl="$safeValue" + break + ;; + esac + done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - + elif command -v curl >/dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi fi + fi fi ########################################################################################## # End of extension @@ -254,22 +275,25 @@ fi # If specified, validate the SHA-256 sum of the Maven wrapper jar file wrapperSha256Sum="" while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + case "$key" in wrapperSha256Sum) + wrapperSha256Sum=$value + break + ;; esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" if [ -n "$wrapperSha256Sum" ]; then wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + if command -v sha256sum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then wrapperSha256Result=true fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + elif command -v shasum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then wrapperSha256Result=true fi else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi if [ $wrapperSha256Result = false ]; then @@ -284,12 +308,12 @@ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] \ + && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") fi # Provide a "standardized" way to retrieve the CLI args that will diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw.cmd b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw.cmd index f80fbad..b694e6c 100644 --- a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw.cmd +++ b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnw.cmd @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM Apache Maven Wrapper startup batch script, version 3.3.0 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -59,22 +59,22 @@ set ERROR_CODE=0 @REM ==== START VALIDATION ==== if not "%JAVA_HOME%" == "" goto OkJHome -echo. +echo. >&2 echo Error: JAVA_HOME not found in your environment. >&2 echo Please set the JAVA_HOME variable in your environment to match the >&2 echo location of your Java installation. >&2 -echo. +echo. >&2 goto error :OkJHome if exist "%JAVA_HOME%\bin\java.exe" goto init -echo. +echo. >&2 echo Error: JAVA_HOME is set to an invalid directory. >&2 echo JAVA_HOME = "%JAVA_HOME%" >&2 echo Please set the JAVA_HOME variable in your environment to match the >&2 echo location of your Java installation. >&2 -echo. +echo. >&2 goto error @REM ==== END VALIDATION ==== @@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B @@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... @@ -160,11 +160,12 @@ FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapp ) IF NOT %WRAPPER_SHA_256_SUM%=="" ( powershell -Command "&{"^ + "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ " exit 1;"^ "}"^ "}" diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug index fbcf70a..ca84183 100755 --- a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug +++ b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug @@ -18,7 +18,7 @@ # under the License. # ----------------------------------------------------------------------------- -# Apache Maven Wrapper debug script, version 3.2.0 +# Apache Maven Wrapper debug script, version 3.3.0 # # Environment Variable Prerequisites # diff --git a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug.cmd b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug.cmd index b9e1947..cacb387 100644 --- a/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug.cmd +++ b/maven-archetype/src/test/resources/projects/it-basic/reference/scripts/mvnwDebug.cmd @@ -16,7 +16,7 @@ @REM under the License. @REM ----------------------------------------------------------------------------- -@REM Apache Maven Wrapper debug script, version 3.2.0 +@REM Apache Maven Wrapper debug script, version 3.3.0 @REM @REM Environment Variable Prerequisites @REM