This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
The following commit(s) were added to refs/heads/main by this push:
new a1d8bbc Bump the maven-minor-updates group across 2 directories with
16 updates (#425)
a1d8bbc is described below
commit a1d8bbce875bfac2c50c3a16b9c847c187136fc0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Sep 9 16:12:50 2026 +0530
Bump the maven-minor-updates group across 2 directories with 16 updates
(#425)
Bumps the maven-minor-updates group with 12 updates in the / directory:
| Package | From | To |
| --- | --- | --- |
| [org.jspecify:jspecify](https://github.com/jspecify/jspecify) | `1.0.0` |
`1.0.1` |
|
[com.github.spotbugs:spotbugs-annotations](https://github.com/spotbugs/spotbugs)
| `4.10.3` | `4.10.4` |
| [com.google.guava:guava](https://github.com/google/guava) | `33.6.0-jre`
| `33.7.1-jre` |
| [joda-time:joda-time](https://github.com/JodaOrg/joda-time) | `2.14.2` |
`2.14.3` |
| org.yaml:snakeyaml | `2.6` | `2.7` |
|
[org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot)
| `3.5.7` | `3.5.16` |
|
[org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot)
| `3.5.7` | `3.5.16` |
|
[org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release)
| `2025.0.0` | `2025.0.3` |
| commons-io:commons-io | `2.17.0` | `2.22.0` |
| [io.netty:netty-bom](https://github.com/netty/netty) | `4.1.135.Final` |
`4.2.17.Final` |
| org.apache.maven:apache-maven | `3.9.9` | `3.9.16` |
|
[org.apache.maven.wrapper:maven-wrapper](https://github.com/apache/maven-wrapper)
| `3.3.2` | `3.3.4` |
Bumps the maven-minor-updates group with 4 updates in the
/log4j-samples-graalvm directory:
[org.junit:junit-bom](https://github.com/junit-team/junit-framework),
[ch.qos.logback:logback-classic](https://github.com/qos-ch/logback),
[net.javacrumbs.json-unit:json-unit-assertj](https://github.com/lukas-krecan/JsonUnit)
and
[org.graalvm.buildtools:native-maven-plugin](https://github.com/graalvm/native-build-tools).
Updates `org.jspecify:jspecify` from 1.0.0 to 1.0.1
- [Release notes](https://github.com/jspecify/jspecify/releases)
- [Commits](https://github.com/jspecify/jspecify/compare/v1.0.0...v1.0.1)
Updates `com.github.spotbugs:spotbugs-annotations` from 4.10.3 to 4.10.4
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.10.3...4.10.4)
Updates `com.google.guava:guava` from 33.6.0-jre to 33.7.1-jre
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)
Updates `joda-time:joda-time` from 2.14.2 to 2.14.3
- [Release notes](https://github.com/JodaOrg/joda-time/releases)
-
[Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt)
- [Commits](https://github.com/JodaOrg/joda-time/compare/v2.14.2...v2.14.3)
Updates `org.yaml:snakeyaml` from 2.6 to 2.7
Updates `org.springframework.boot:spring-boot-dependencies` from 3.5.7 to
3.5.16
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
-
[Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v3.5.16)
Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.7 to
3.5.16
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
-
[Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v3.5.16)
Updates `org.springframework.cloud:spring-cloud-dependencies` from 2025.0.0
to 2025.0.3
- [Release
notes](https://github.com/spring-cloud/spring-cloud-release/releases)
-
[Changelog](https://github.com/spring-cloud/spring-cloud-release/blob/main/release-train-settings.xml)
-
[Commits](https://github.com/spring-cloud/spring-cloud-release/compare/v2025.0.0...v2025.0.3)
Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.7 to
3.5.16
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
-
[Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v3.5.16)
Updates `commons-io:commons-io` from 2.17.0 to 2.22.0
Updates `io.netty:netty-bom` from 4.1.135.Final to 4.2.17.Final
- [Release notes](https://github.com/netty/netty/releases)
-
[Commits](https://github.com/netty/netty/compare/netty-4.1.135.Final...netty-4.2.17.Final)
Updates `org.apache.maven:apache-maven` from 3.9.9 to 3.9.16
Updates `org.apache.maven.wrapper:maven-wrapper` from 3.3.2 to 3.3.4
- [Release notes](https://github.com/apache/maven-wrapper/releases)
-
[Commits](https://github.com/apache/maven-wrapper/compare/maven-wrapper-3.3.2...maven-wrapper-3.3.4)
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 `ch.qos.logback:logback-classic` from 1.6.0 to 1.6.3
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.6.0...v_1.6.3)
Updates `net.javacrumbs.json-unit:json-unit-assertj` from 6.0.1 to 6.2.0
-
[Changelog](https://github.com/lukas-krecan/JsonUnit/blob/master/RELEASES.md)
-
[Commits](https://github.com/lukas-krecan/JsonUnit/compare/json-unit-parent-6.0.1...json-unit-parent-6.2.0)
Updates `org.graalvm.buildtools:native-maven-plugin` from 1.1.5 to 1.1.11
- [Release notes](https://github.com/graalvm/native-build-tools/releases)
-
[Commits](https://github.com/graalvm/native-build-tools/compare/1.1.5...1.1.11)
---
updated-dependencies:
- dependency-name: org.jspecify:jspecify
dependency-version: 1.0.1
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: com.github.spotbugs:spotbugs-annotations
dependency-version: 4.10.4
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: com.google.guava:guava
dependency-version: 33.7.1-jre
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: joda-time:joda-time
dependency-version: 2.14.3
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.yaml:snakeyaml
dependency-version: '2.7'
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: org.springframework.boot:spring-boot-dependencies
dependency-version: 3.5.16
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
dependency-version: 3.5.16
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
dependency-version: 2025.0.3
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
dependency-version: 3.5.16
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: commons-io:commons-io
dependency-version: 2.22.0
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: io.netty:netty-bom
dependency-version: 4.2.17.Final
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: org.apache.maven:apache-maven
dependency-version: 3.9.16
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.apache.maven.wrapper:maven-wrapper
dependency-version: 3.3.4
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.junit:junit-bom
dependency-version: 6.1.3
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: ch.qos.logback:logback-classic
dependency-version: 1.6.3
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: net.javacrumbs.json-unit:json-unit-assertj
dependency-version: 6.2.0
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: org.graalvm.buildtools:native-maven-plugin
dependency-version: 1.1.11
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.mvn/wrapper/maven-wrapper.properties | 20 +-
log4j-samples-flume-embedded/pom.xml | 2 +-
log4j-samples-graalvm/pom.xml | 8 +-
.../pom.xml | 2 +-
mvnw | 50 ++-
mvnw.cmd | 338 ++++++++++++---------
pom.xml | 14 +-
7 files changed, 247 insertions(+), 187 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index d58dfb7..216df05 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,19 +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.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
diff --git a/log4j-samples-flume-embedded/pom.xml
b/log4j-samples-flume-embedded/pom.xml
index 09ba24e..38df948 100644
--- a/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples-flume-embedded/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.17.0</version>
+ <version>2.22.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/log4j-samples-graalvm/pom.xml b/log4j-samples-graalvm/pom.xml
index 60dd639..7bdb4d6 100644
--- a/log4j-samples-graalvm/pom.xml
+++ b/log4j-samples-graalvm/pom.xml
@@ -61,9 +61,9 @@
<!-- Dependencies (alphabetical) -->
<assertj.version>3.27.7</assertj.version>
<json-org.version>20260719</json-org.version>
- <json-unit.version>6.0.1</json-unit.version>
- <junit.version>6.1.2</junit.version>
- <logback.version>1.6.0</logback.version>
+ <json-unit.version>6.2.0</json-unit.version>
+ <junit.version>6.1.3</junit.version>
+ <logback.version>1.6.3</logback.version>
<slf4j.version>2.0.18</slf4j.version>
<!-- Maven plugins (alphabetical) -->
@@ -74,7 +74,7 @@
~
~ See: https://github.com/graalvm/native-build-tools/issues/1000
-->
- <native-maven-plugin.version>1.1.5</native-maven-plugin.version>
+ <native-maven-plugin.version>1.1.11</native-maven-plugin.version>
<!-- IT to run for each profile -->
<integration-tests-include>none</integration-tests-include>
diff --git a/log4j-spring-cloud-config-sample-application/pom.xml
b/log4j-spring-cloud-config-sample-application/pom.xml
index 9d89590..af7ed14 100644
--- a/log4j-spring-cloud-config-sample-application/pom.xml
+++ b/log4j-spring-cloud-config-sample-application/pom.xml
@@ -39,7 +39,7 @@
<!-- Dependency versions -->
<kubernetes-client.version>7.8.0</kubernetes-client.version>
- <netty.version>4.1.135.Final</netty.version>
+ <netty.version>4.2.17.Final</netty.version>
</properties>
<dependencyManagement>
diff --git a/mvnw b/mvnw
index 19529dd..bd8896b 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.2
+# Apache Maven Wrapper startup batch script, version 3.3.4
#
# Optional ENV vars
# -----------------
@@ -105,14 +105,17 @@ trim() {
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=$(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.*)
@@ -130,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
@@ -227,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
@@ -252,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 249bdf3..5761d94 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,149 +1,189 @@
-<# : batch portion
-@REM
----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
----------------------------------------------------------------------------
-
-@REM
----------------------------------------------------------------------------
-@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
-@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM
----------------------------------------------------------------------------
-
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "&
{$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock
([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
- IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE
(echo %%A=%%B)
-)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
-: end batch / begin powershell #>
-
-$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
- $VerbosePreference = "Continue"
-}
-
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw
"$scriptDir/.mvn/wrapper/maven-wrapper.properties" |
ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
- Write-Error "cannot read distributionUrl property in
$scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
-
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
- "maven-mvnd-*" {
- $USE_MVND = $true
- $distributionUrl = $distributionUrl -replace
'-bin\.[^.]*$',"-windows-amd64.zip"
- $MVN_CMD = "mvnd.cmd"
- break
- }
- default {
- $USE_MVND = $false
- $MVN_CMD = $script -replace '^mvnw','mvn'
- break
- }
-}
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern:
~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-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,'')"
-}
-$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"
-
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
- Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
- Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
- exit $?
-}
-
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq
$distributionUrlNameMain)) {
- Write-Error "distributionUrl is not valid, must end with *-bin.zip, but
found $distributionUrl"
-}
-
-# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path
"$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
- if ($TMP_DOWNLOAD_DIR.Exists) {
- try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
- catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
- }
-}
-
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
-# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
- $webclient.Credentials = New-Object
System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl,
"$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw
"$scriptDir/.mvn/wrapper/maven-wrapper.properties" |
ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
- if ($USE_MVND) {
- Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease
disable validation by removing 'distributionSha256Sum' from your
maven-wrapper.properties."
- }
- Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function
Get-FileHash
- if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm
SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
- Write-Error "Error: Failed to validate Maven distribution SHA-256, your
Maven distribution might be compromised. If you updated your Maven version, you
need to update the specified distributionSha256Sum property."
- }
-}
-
-# 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
-try {
- Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination
$MAVEN_HOME_PARENT | Out-Null
-} catch {
- if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
- Write-Error "fail to move MAVEN_HOME"
- }
-} finally {
- try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
- catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
-
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+<# : batch portion
+@REM
----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM
----------------------------------------------------------------------------
+
+@REM
----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Optional ENV vars
+@REM MVNW_REPOURL - repo url base for downloading maven distribution
+@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM
----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "&
{$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock
([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+ IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE
(echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+ $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw
"$scriptDir/.mvn/wrapper/maven-wrapper.properties" |
ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+ Write-Error "cannot read distributionUrl property in
$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+ "maven-mvnd-*" {
+ $USE_MVND = $true
+ $distributionUrl = $distributionUrl -replace
'-bin\.[^.]*$',"-windows-amd64.zip"
+ $MVN_CMD = "mvnd.cmd"
+ break
+ }
+ default {
+ $USE_MVND = $false
+ $MVN_CMD = $script -replace '^mvnw','mvn'
+ break
+ }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern:
~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+ $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_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) {
+ Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+ exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq
$distributionUrlNameMain)) {
+ Write-Error "distributionUrl is not valid, must end with *-bin.zip, but
found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path
"$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+ if ($TMP_DOWNLOAD_DIR.Exists) {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+ }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+ $webclient.Credentials = New-Object
System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl,
"$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw
"$scriptDir/.mvn/wrapper/maven-wrapper.properties" |
ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+ if ($USE_MVND) {
+ Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease
disable validation by removing 'distributionSha256Sum' from your
maven-wrapper.properties."
+ }
+ Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function
Get-FileHash
+ if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm
SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+ Write-Error "Error: Failed to validate Maven distribution SHA-256, your
Maven distribution might be compromised. If you updated your Maven version, you
need to update the specified distributionSha256Sum property."
+ }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath
"$TMP_DOWNLOAD_DIR" | 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 {
+ if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+ Write-Error "fail to move MAVEN_HOME"
+ }
+} finally {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/pom.xml b/pom.xml
index 20c4567..ebe5a23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,21 +89,21 @@
<flume.version>1.11.0</flume.version>
<jetty.version>11.0.26</jetty.version>
<javax-jms.version>2.0.1</javax-jms.version>
- <jspecify.version>1.0.0</jspecify.version>
+ <jspecify.version>1.0.1</jspecify.version>
<osgi-annotation-bundle.version>2.0.0</osgi-annotation-bundle.version>
- <spotbugs-annotations.version>4.10.3</spotbugs-annotations.version>
- <spring-boot.version>3.5.7</spring-boot.version>
- <spring-cloud.version>2025.0.0</spring-cloud.version>
+ <spotbugs-annotations.version>4.10.4</spotbugs-annotations.version>
+ <spring-boot.version>3.5.16</spring-boot.version>
+ <spring-cloud.version>2025.0.3</spring-cloud.version>
<!-- Pinned transitive dependencies -->
<!-- Try removing from time to time -->
<error_prone.version>2.50.0</error_prone.version>
- <guava.version>33.6.0-jre</guava.version>
+ <guava.version>33.7.1-jre</guava.version>
<httpclient.version>4.5.14</httpclient.version>
<jackson.version>2.22.2</jackson.version>
- <joda-time.version>2.14.2</joda-time.version>
+ <joda-time.version>2.14.3</joda-time.version>
<kotlin.version>2.4.10</kotlin.version>
- <snakeyaml.version>2.6</snakeyaml.version>
+ <snakeyaml.version>2.7</snakeyaml.version>
<slf4j.version>2.0.18</slf4j.version>
</properties>
