From 60d33cc154bb20c6b10f83437896e88a5cd87781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 19:17:10 +0000 Subject: [PATCH] build(deps): Bump the monthly-batch group across 1 directory with 26 updates Bumps the monthly-batch group with 26 updates in the / directory: | Package | From | To | | --- | --- | --- | | [jakarta.enterprise:jakarta.enterprise.cdi-api](https://github.com/eclipse-ee4j/cdi) | `4.1.0` | `5.0.0` | | [jakarta.json.bind:jakarta.json.bind-api](https://github.com/jakartaee/jsonb-api) | `3.0.2` | `3.0.4` | | [org.eclipse.microprofile.config:microprofile-config-api](https://github.com/eclipse/microprofile-config) | `3.1.1` | `3.1.3` | | [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) | `42.7.13` | `42.7.14` | | org.slf4j:slf4j-api | `2.0.18` | `2.0.20` | | [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.6.1` | `1.6.6` | | org.flywaydb:flyway-core | `13.1.0` | `13.11.1` | | org.flywaydb:flyway-database-postgresql | `13.1.0` | `13.11.1` | | org.flywaydb:flyway-database-postgresql | `13.1.0` | `13.11.1` | | org.freemarker:freemarker | `2.3.34` | `2.3.35` | | [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) | `1.85` | `1.86` | | [org.bouncycastle:bcpg-jdk18on](https://github.com/bcgit/bc-java) | `1.85` | `1.86` | | [org.bouncycastle:bcutil-jdk18on](https://github.com/bcgit/bc-java) | `1.85` | `1.86` | | [org.bouncycastle:bcpg-jdk18on](https://github.com/bcgit/bc-java) | `1.85` | `1.86` | | [org.bouncycastle:bcutil-jdk18on](https://github.com/bcgit/bc-java) | `1.85` | `1.86` | | org.apache.cxf:cxf-rt-frontend-jaxrs | `4.2.2` | `4.2.4` | | org.apache.cxf:cxf-rt-rs-client | `4.2.2` | `4.2.4` | | org.apache.cxf:cxf-rt-rs-client | `4.2.2` | `4.2.4` | | org.apache.johnzon:johnzon-core | `2.1.0` | `2.2.0` | | org.apache.johnzon:johnzon-jsonb | `2.1.0` | `2.2.0` | | org.apache.johnzon:johnzon-jsonb | `2.1.0` | `2.2.0` | | [org.junit:junit-bom](https://github.com/junit-team/junit-framework) | `6.1.2` | `6.1.3` | | [com.palantir.javaformat:palantir-java-format](https://github.com/palantir/palantir-java-format) | `2.96.0` | `2.102.0` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.15.0` | `3.16.0` | | [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) | `3.5.6` | `3.6.1` | | [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) | `3.1.4` | `3.2.0` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.5.6` | `3.6.1` | | [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | `3.9.0` | `3.10.4` | | [io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven) | `3.12.1` | `3.12.4` | | [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) | `3.6.1` | `3.6.2` | | org.apache.maven:apache-maven | `3.9.16` | `3.10.0` | Updates `jakarta.enterprise:jakarta.enterprise.cdi-api` from 4.1.0 to 5.0.0 - [Release notes](https://github.com/eclipse-ee4j/cdi/releases) - [Commits](https://github.com/eclipse-ee4j/cdi/compare/4.1.0...5.0.0) Updates `jakarta.json.bind:jakarta.json.bind-api` from 3.0.2 to 3.0.4 - [Release notes](https://github.com/jakartaee/jsonb-api/releases) - [Commits](https://github.com/jakartaee/jsonb-api/compare/3.0.2...3.0.4) Updates `org.eclipse.microprofile.config:microprofile-config-api` from 3.1.1 to 3.1.3 - [Release notes](https://github.com/eclipse/microprofile-config/releases) - [Commits](https://github.com/eclipse/microprofile-config/compare/3.1.1...3.1.3) Updates `org.postgresql:postgresql` from 42.7.13 to 42.7.14 - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.13...REL42.7.14) Updates `org.slf4j:slf4j-api` from 2.0.18 to 2.0.20 Updates `ch.qos.logback:logback-classic` from 1.6.1 to 1.6.6 - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.6.1...v_1.6.6) Updates `org.flywaydb:flyway-core` from 13.1.0 to 13.11.1 Updates `org.flywaydb:flyway-database-postgresql` from 13.1.0 to 13.11.1 Updates `org.flywaydb:flyway-database-postgresql` from 13.1.0 to 13.11.1 Updates `org.freemarker:freemarker` from 2.3.34 to 2.3.35 Updates `org.bouncycastle:bcprov-jdk18on` from 1.85 to 1.86 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcpg-jdk18on` from 1.85 to 1.86 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcutil-jdk18on` from 1.85 to 1.86 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcpg-jdk18on` from 1.85 to 1.86 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcutil-jdk18on` from 1.85 to 1.86 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.apache.cxf:cxf-rt-frontend-jaxrs` from 4.2.2 to 4.2.4 Updates `org.apache.cxf:cxf-rt-rs-client` from 4.2.2 to 4.2.4 Updates `org.apache.cxf:cxf-rt-rs-client` from 4.2.2 to 4.2.4 Updates `org.apache.johnzon:johnzon-core` from 2.1.0 to 2.2.0 Updates `org.apache.johnzon:johnzon-jsonb` from 2.1.0 to 2.2.0 Updates `org.apache.johnzon:johnzon-jsonb` from 2.1.0 to 2.2.0 Updates `org.junit:junit-bom` from 6.1.2 to 6.1.3 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3) Updates `com.palantir.javaformat:palantir-java-format` from 2.96.0 to 2.102.0 - [Release notes](https://github.com/palantir/palantir-java-format/releases) - [Commits](https://github.com/palantir/palantir-java-format/compare/2.96.0...2.102.0) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.15.0 to 3.16.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.15.0...maven-compiler-plugin-3.16.0) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.6 to 3.6.1 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.6...surefire-3.6.1) Updates `org.apache.maven.plugins:maven-install-plugin` from 3.1.4 to 3.2.0 - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.4...maven-install-plugin-3.2.0) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.6 to 3.6.1 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.6...surefire-3.6.1) Updates `com.diffplug.spotless:spotless-maven-plugin` from 3.9.0 to 3.10.4 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/maven/3.9.0...maven/3.10.4) Updates `io.openliberty.tools:liberty-maven-plugin` from 3.12.1 to 3.12.4 - [Release notes](https://github.com/OpenLiberty/ci.maven/releases) - [Commits](https://github.com/OpenLiberty/ci.maven/compare/liberty-maven-3.12.1...liberty-maven-3.12.4) Updates `org.codehaus.mojo:build-helper-maven-plugin` from 3.6.1 to 3.6.2 - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.6.1...3.6.2) Updates `org.apache.maven:apache-maven` from 3.9.16 to 3.10.0 --- updated-dependencies: - dependency-name: jakarta.enterprise:jakarta.enterprise.cdi-api dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: monthly-batch - dependency-name: jakarta.json.bind:jakarta.json.bind-api dependency-version: 3.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.eclipse.microprofile.config:microprofile-config-api dependency-version: 3.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.postgresql:postgresql dependency-version: 42.7.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.slf4j:slf4j-api dependency-version: 2.0.20 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: ch.qos.logback:logback-classic dependency-version: 1.6.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.flywaydb:flyway-core dependency-version: 13.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.flywaydb:flyway-database-postgresql dependency-version: 13.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.flywaydb:flyway-database-postgresql dependency-version: 13.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.freemarker:freemarker dependency-version: 2.3.35 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-version: '1.86' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.bouncycastle:bcpg-jdk18on dependency-version: '1.86' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.bouncycastle:bcutil-jdk18on dependency-version: '1.86' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.bouncycastle:bcpg-jdk18on dependency-version: '1.86' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.bouncycastle:bcutil-jdk18on dependency-version: '1.86' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxrs dependency-version: 4.2.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.apache.cxf:cxf-rt-rs-client dependency-version: 4.2.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.apache.cxf:cxf-rt-rs-client dependency-version: 4.2.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.apache.johnzon:johnzon-core dependency-version: 2.2.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.johnzon:johnzon-jsonb dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.johnzon:johnzon-jsonb dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.junit:junit-bom dependency-version: 6.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: com.palantir.javaformat:palantir-java-format dependency-version: 2.102.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-version: 3.16.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-version: 3.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-version: 3.2.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-version: 3.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: com.diffplug.spotless:spotless-maven-plugin dependency-version: 3.10.4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch - dependency-name: io.openliberty.tools:liberty-maven-plugin dependency-version: 3.12.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-version: 3.6.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: monthly-batch - dependency-name: org.apache.maven:apache-maven dependency-version: 3.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: monthly-batch ... Signed-off-by: dependabot[bot] --- .mvn/wrapper/maven-wrapper.properties | 20 ++------ mvnw | 65 ++++++++++++++++++++++---- mvnw.cmd | 55 +++++++++++++++++++--- pom.xml | 38 +++++++-------- web/openpgp-keyserver-protocol/pom.xml | 2 +- 5 files changed, 127 insertions(+), 53 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 1179c29..bb58b3c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,17 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip diff --git a/mvnw b/mvnw index 8230a4c..bd8896b 100755 --- a/mvnw +++ b/mvnw @@ -97,14 +97,25 @@ 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:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # 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" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -122,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -131,7 +142,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 || : @@ -199,7 +211,7 @@ elif set_java_home; then public static void main( String[] args ) throws Exception { setDefault( new Downloader() ); - java.nio.file.Files.copy( new java.net.URL( args[0] ).openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); } } END @@ -218,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -243,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 205d17d..5761d94 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -40,7 +40,7 @@ @SET __MVNW_ARG0_NAME__= @SET MVNW_USERNAME= @SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) @echo Cannot start maven from wrapper >&2 && exit /b 1 @GOTO :EOF : end batch / begin powershell #> @@ -73,13 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { # apply MVNW_REPOURL and calculate MAVEN_HOME # maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" } $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { @@ -131,7 +148,33 @@ if ($distributionSha256Sum) { # unzip and move Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null try { Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null } catch { diff --git a/pom.xml b/pom.xml index a539c84..da3a7d0 100644 --- a/pom.xml +++ b/pom.xml @@ -47,17 +47,17 @@ 1.0.1 2.10.0 - 1.85 + 1.86 2.1.4 - 2.3.34 - 2.1.0 + 2.3.35 + 2.2.0 - 2.96.0 - 13.1.0 + 2.102.0 + 13.11.1 2.0.5 - 42.7.13 - 4.2.2 + 42.7.14 + 4.2.4 @@ -74,7 +74,7 @@ jakarta.enterprise jakarta.enterprise.cdi-api - 4.1.0 + 5.0.0 provided @@ -104,7 +104,7 @@ jakarta.json.bind jakarta.json.bind-api - 3.0.2 + 3.0.4 provided @@ -131,7 +131,7 @@ org.eclipse.microprofile.config microprofile-config-api - 3.1.1 + 3.1.3 provided @@ -151,12 +151,12 @@ org.slf4j slf4j-api - 2.0.18 + 2.0.20 ch.qos.logback logback-classic - 1.6.1 + 1.6.6 test @@ -226,7 +226,7 @@ org.junit junit-bom - 6.1.2 + 6.1.3 pom import @@ -290,7 +290,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.15.0 + 3.16.0 @@ -302,13 +302,13 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.6 + 3.6.1 org.apache.maven.plugins maven-install-plugin - 3.1.4 + 3.2.0 @@ -326,7 +326,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.6 + 3.6.1 @@ -353,13 +353,13 @@ com.diffplug.spotless spotless-maven-plugin - 3.9.0 + 3.10.4 io.openliberty.tools liberty-maven-plugin - 3.12.1 + 3.12.4 diff --git a/web/openpgp-keyserver-protocol/pom.xml b/web/openpgp-keyserver-protocol/pom.xml index 93fcb70..f1d518d 100644 --- a/web/openpgp-keyserver-protocol/pom.xml +++ b/web/openpgp-keyserver-protocol/pom.xml @@ -137,7 +137,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.1 + 3.6.2 add-test-source