diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fe378a1..487119c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.1 -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://nexus.reloadkube.managedservices.resilient-teched.com/repository/default//org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/configs/pom.xml b/configs/pom.xml index 2247ef7..04ff120 100644 --- a/configs/pom.xml +++ b/configs/pom.xml @@ -16,7 +16,7 @@ - 1.2.1 + 1.2.2 -SNAPSHOT diff --git a/mvnw b/mvnw index ac8e247..19529dd 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.1 +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- @@ -97,11 +97,19 @@ die() { exit 1 } +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in - distributionUrl) distributionUrl="${value-}" ;; - distributionSha256Sum) distributionSha256Sum="${value-}" ;; + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" [ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" @@ -131,7 +139,8 @@ esac distributionUrlName="${distributionUrl##*/}" distributionUrlNameMain="${distributionUrlName%.*}" distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" exec_maven() { unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : diff --git a/mvnw.cmd b/mvnw.cmd index 7b0c094..249bdf3 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) { $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' $MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} $MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" diff --git a/pom.xml b/pom.xml index 40e7081..1dec098 100644 --- a/pom.xml +++ b/pom.xml @@ -18,14 +18,14 @@ - 1.2.1 + 1.2.2 -SNAPSHOT 24.1.0 4.8.5 2.2 - 5.11.0-M1 - 5.11.0 + 5.11.0-M2 + 5.12.0 3.4.1 3.2.5 @@ -33,21 +33,20 @@ 3.3.1 3.6.3 3.5.3 - 0.1.3 + 0.1.3 3.22.0 7.1.0 7.1.0 4.8.5.0 3.3.1 - 10.16.0 + 10.17.0 3.5.0 3.3.2 2.7 - 1.16.0 + 1.16.1 1.2.1 2.16.2 - 3.3.1 + 3.3.2 @@ -216,19 +215,6 @@ - - - - org.ec4j.linters - editorconfig-lint-api - 2.2.2 - - - org.ec4j.linters - editorconfig-linters - 2.2.2 - - org.apache.maven.plugins diff --git a/versions/pom.xml b/versions/pom.xml index 0a72f8d..6038285 100644 --- a/versions/pom.xml +++ b/versions/pom.xml @@ -18,7 +18,7 @@ - 1.2.1 + 1.2.2 -SNAPSHOT UTF-8 @@ -35,7 +35,7 @@ 3.2.5 3.1.2 3.1.2 - 4.0.0-M13 + 4.0.0-M14 1.6.0