This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new adb26e608 chore(deps): bump the maven-dependencies group with 15
updates (#2864)
adb26e608 is described below
commit adb26e6084a46512a4365553732684ed3896024e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 18 20:47:57 2026 -0500
chore(deps): bump the maven-dependencies group with 15 updates (#2864)
Bumps the maven-dependencies group with 15 updates:
| Package | From | To |
| --- | --- | --- |
| [org.apache.groovy:groovy-all](https://github.com/apache/groovy) |
`5.0.8` | `5.1.0` |
| [org.apache.groovy:groovy](https://github.com/apache/groovy) | `5.0.8` |
`5.1.0` |
|
[com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) |
`13.9.0` | `13.10.0` |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) |
`1.6.1` | `1.6.3` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) |
`1.6.1` | `1.6.3` |
| [com.google.guava:guava](https://github.com/google/guava) | `33.6.0-jre`
| `33.7.1-jre` |
| org.apache.tomcat.embed:tomcat-embed-core | `11.0.24` | `11.0.25` |
| org.apache.tomcat.embed:tomcat-embed-el | `11.0.24` | `11.0.25` |
| org.apache.tomcat.embed:tomcat-embed-websocket | `11.0.24` | `11.0.25` |
| org.apache.tomcat:tomcat-jaspic-api | `11.0.24` | `11.0.25` |
| org.apache.tomcat:tomcat-catalina | `11.0.24` | `11.0.25` |
| org.apache.tomcat:tomcat-jasper | `11.0.24` | `11.0.25` |
| org.apache.tomcat:tomcat-jasper-el | `11.0.24` | `11.0.25` |
|
[io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven)
| `3.12.1` | `3.12.2` |
| org.apache.maven:apache-maven | `3.9.12` | `3.9.16` |
Updates `org.apache.groovy:groovy-all` from 5.0.8 to 5.1.0
- [Commits](https://github.com/apache/groovy/commits)
Updates `org.apache.groovy:groovy` from 5.0.8 to 5.1.0
- [Commits](https://github.com/apache/groovy/commits)
Updates `com.puppycrawl.tools:checkstyle` from 13.9.0 to 13.10.0
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
-
[Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-13.9.0...checkstyle-13.10.0)
Updates `org.apache.groovy:groovy` from 5.0.8 to 5.1.0
- [Commits](https://github.com/apache/groovy/commits)
Updates `ch.qos.logback:logback-core` from 1.6.1 to 1.6.3
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.6.1...v_1.6.3)
Updates `ch.qos.logback:logback-classic` from 1.6.1 to 1.6.3
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.6.1...v_1.6.3)
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 `org.apache.tomcat.embed:tomcat-embed-core` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat.embed:tomcat-embed-el` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.24 to
11.0.25
Updates `org.apache.tomcat:tomcat-jaspic-api` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat:tomcat-catalina` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat:tomcat-jasper` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat:tomcat-jasper-el` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat.embed:tomcat-embed-el` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 11.0.24 to
11.0.25
Updates `org.apache.tomcat:tomcat-jaspic-api` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat:tomcat-catalina` from 11.0.24 to 11.0.25
Updates `io.openliberty.tools:liberty-maven-plugin` from 3.12.1 to 3.12.2
- [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.2)
Updates `org.apache.tomcat:tomcat-jasper` from 11.0.24 to 11.0.25
Updates `org.apache.tomcat:tomcat-jasper-el` from 11.0.24 to 11.0.25
Updates `org.apache.maven:apache-maven` from 3.9.12 to 3.9.16
---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy-all
dependency-version: 5.1.0
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-dependencies
- dependency-name: org.apache.groovy:groovy
dependency-version: 5.1.0
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: maven-dependencies
- dependency-name: com.puppycrawl.tools:checkstyle
dependency-version: 13.10.0
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-dependencies
- dependency-name: org.apache.groovy:groovy
dependency-version: 5.1.0
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: maven-dependencies
- dependency-name: ch.qos.logback:logback-core
dependency-version: 1.6.3
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- 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-dependencies
- 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-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-core
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-el
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jaspic-api
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-catalina
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jasper
dependency-version: 11.0.25
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jasper-el
dependency-version: 11.0.25
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-el
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jaspic-api
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-catalina
dependency-version: 11.0.25
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: io.openliberty.tools:liberty-maven-plugin
dependency-version: 3.12.2
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jasper
dependency-version: 11.0.25
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- dependency-name: org.apache.tomcat:tomcat-jasper-el
dependency-version: 11.0.25
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-dependencies
- 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-dependencies
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
integration-tests/jaxrs/openliberty/pom.xml | 2 +-
mvnw.cmd | 378 ++++++++++++++--------------
pom.xml | 12 +-
4 files changed, 197 insertions(+), 197 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 8dea6c227..216df0589 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,3 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-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/integration-tests/jaxrs/openliberty/pom.xml
b/integration-tests/jaxrs/openliberty/pom.xml
index da9ccb4f8..4e38ca87f 100644
--- a/integration-tests/jaxrs/openliberty/pom.xml
+++ b/integration-tests/jaxrs/openliberty/pom.xml
@@ -60,7 +60,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.12.2</version>
<configuration>
<serverName>shiro-its-jaxrs-openliberty</serverName>
<features>
diff --git a/mvnw.cmd b/mvnw.cmd
index 92450f932..5761d9489 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,189 +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.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"
+<# : 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 324aa8c2b..e6cf1ceba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<hsqldb.version>2.7.4</hsqldb.version>
<jcache.api.version>1.1.1</jcache.api.version>
<jdk.version>17</jdk.version>
- <tomcat.version>11.0.24</tomcat.version>
+ <tomcat.version>11.0.25</tomcat.version>
<jakarta.ee.version>11.0.0</jakarta.ee.version>
<jetty.version>12.1.12</jetty.version>
<owasp.java.encoder.version>1.4.0</owasp.java.encoder.version>
@@ -127,7 +127,7 @@
<mockito.version>5.23.0</mockito.version>
<bytebuddy.version>1.18.11</bytebuddy.version>
<gmaven.version>5.1.0</gmaven.version>
- <groovy.version>5.0.8</groovy.version>
+ <groovy.version>5.1.0</groovy.version>
<junit.version>6.1.3</junit.version>
<junit.server.jetty.version>3.5.0</junit.server.jetty.version>
<hibernate.version>7.4.5.Final</hibernate.version>
@@ -527,7 +527,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>13.9.0</version>
+ <version>13.10.0</version>
</dependency>
</dependencies>
</plugin>
@@ -1123,12 +1123,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.6.1</version>
+ <version>1.6.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.6.1</version>
+ <version>1.6.3</version>
</dependency>
<dependency>
@@ -1352,7 +1352,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>33.6.0-jre</version>
+ <version>33.7.1-jre</version>
</dependency>
<dependency>
