Skip to content

Commit 1086ab3

Browse files
chore(deps): update dependency maven-wrapper to v3.3.2 (#81)
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [maven-wrapper](https://maven.apache.org/) | `3.3.1` -> `3.3.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/maven-wrapper/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/maven-wrapper/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/maven-wrapper/3.3.1/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/maven-wrapper/3.3.1/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/Hapag-Lloyd/json-logic-rule-maker). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xMjAuMSIsInVwZGF0ZWRJblZlciI6IjM4LjEyMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmN5Il19--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 114f613 commit 1086ab3

File tree

3 files changed

+164
-151
lines changed

3 files changed

+164
-151
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
wrapperVersion=3.3.1
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
1819
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

mvnw

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Apache Maven Wrapper startup batch script, version 3.3.1
22+
# Apache Maven Wrapper startup batch script, version 3.3.2
2323
#
2424
# Optional ENV vars
2525
# -----------------
@@ -97,11 +97,19 @@ die() {
9797
exit 1
9898
}
9999

100+
trim() {
101+
# MWRAPPER-139:
102+
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
103+
# Needed for removing poorly interpreted newline sequences when running in more
104+
# exotic environments such as mingw bash on Windows.
105+
printf "%s" "${1}" | tr -d '[:space:]'
106+
}
107+
100108
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
101109
while IFS="=" read -r key value; do
102110
case "${key-}" in
103-
distributionUrl) distributionUrl="${value-}" ;;
104-
distributionSha256Sum) distributionSha256Sum="${value-}" ;;
111+
distributionUrl) distributionUrl=$(trim "${value-}") ;;
112+
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
105113
esac
106114
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
107115
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
@@ -131,7 +139,8 @@ esac
131139
distributionUrlName="${distributionUrl##*/}"
132140
distributionUrlNameMain="${distributionUrlName%.*}"
133141
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
134-
MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
142+
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
143+
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
135144

136145
exec_maven() {
137146
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :

mvnw.cmd

Lines changed: 149 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,149 @@
1-
<# : batch portion
2-
@REM ----------------------------------------------------------------------------
3-
@REM Licensed to the Apache Software Foundation (ASF) under one
4-
@REM or more contributor license agreements. See the NOTICE file
5-
@REM distributed with this work for additional information
6-
@REM regarding copyright ownership. The ASF licenses this file
7-
@REM to you under the Apache License, Version 2.0 (the
8-
@REM "License"); you may not use this file except in compliance
9-
@REM with the License. You may obtain a copy of the License at
10-
@REM
11-
@REM http://www.apache.org/licenses/LICENSE-2.0
12-
@REM
13-
@REM Unless required by applicable law or agreed to in writing,
14-
@REM software distributed under the License is distributed on an
15-
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
@REM KIND, either express or implied. See the License for the
17-
@REM specific language governing permissions and limitations
18-
@REM under the License.
19-
@REM ----------------------------------------------------------------------------
20-
21-
@REM ----------------------------------------------------------------------------
22-
@REM Apache Maven Wrapper startup batch script, version 3.3.1
23-
@REM
24-
@REM Optional ENV vars
25-
@REM MVNW_REPOURL - repo url base for downloading maven distribution
26-
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
27-
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
28-
@REM ----------------------------------------------------------------------------
29-
30-
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
31-
@SET __MVNW_CMD__=
32-
@SET __MVNW_ERROR__=
33-
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
34-
@SET PSModulePath=
35-
@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 @(
36-
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
37-
)
38-
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
39-
@SET __MVNW_PSMODULEP_SAVE=
40-
@SET __MVNW_ARG0_NAME__=
41-
@SET MVNW_USERNAME=
42-
@SET MVNW_PASSWORD=
43-
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
44-
@echo Cannot start maven from wrapper >&2 && exit /b 1
45-
@GOTO :EOF
46-
: end batch / begin powershell #>
47-
48-
$ErrorActionPreference = "Stop"
49-
if ($env:MVNW_VERBOSE -eq "true") {
50-
$VerbosePreference = "Continue"
51-
}
52-
53-
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
54-
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
55-
if (!$distributionUrl) {
56-
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
57-
}
58-
59-
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
60-
"maven-mvnd-*" {
61-
$USE_MVND = $true
62-
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
63-
$MVN_CMD = "mvnd.cmd"
64-
break
65-
}
66-
default {
67-
$USE_MVND = $false
68-
$MVN_CMD = $script -replace '^mvnw','mvn'
69-
break
70-
}
71-
}
72-
73-
# apply MVNW_REPOURL and calculate MAVEN_HOME
74-
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
75-
if ($env:MVNW_REPOURL) {
76-
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
77-
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
78-
}
79-
$distributionUrlName = $distributionUrl -replace '^.*/',''
80-
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
81-
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
82-
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
83-
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
84-
85-
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
86-
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
87-
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
88-
exit $?
89-
}
90-
91-
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
92-
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
93-
}
94-
95-
# prepare tmp dir
96-
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
97-
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
98-
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
99-
trap {
100-
if ($TMP_DOWNLOAD_DIR.Exists) {
101-
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
102-
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
103-
}
104-
}
105-
106-
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
107-
108-
# Download and Install Apache Maven
109-
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
110-
Write-Verbose "Downloading from: $distributionUrl"
111-
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
112-
113-
$webclient = New-Object System.Net.WebClient
114-
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
115-
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
116-
}
117-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
118-
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
119-
120-
# If specified, validate the SHA-256 sum of the Maven distribution zip file
121-
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
122-
if ($distributionSha256Sum) {
123-
if ($USE_MVND) {
124-
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
125-
}
126-
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
127-
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
128-
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."
129-
}
130-
}
131-
132-
# unzip and move
133-
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
134-
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
135-
try {
136-
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
137-
} catch {
138-
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
139-
Write-Error "fail to move MAVEN_HOME"
140-
}
141-
} finally {
142-
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
143-
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
144-
}
145-
146-
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
1+
<# : batch portion
2+
@REM ----------------------------------------------------------------------------
3+
@REM Licensed to the Apache Software Foundation (ASF) under one
4+
@REM or more contributor license agreements. See the NOTICE file
5+
@REM distributed with this work for additional information
6+
@REM regarding copyright ownership. The ASF licenses this file
7+
@REM to you under the Apache License, Version 2.0 (the
8+
@REM "License"); you may not use this file except in compliance
9+
@REM with the License. You may obtain a copy of the License at
10+
@REM
11+
@REM http://www.apache.org/licenses/LICENSE-2.0
12+
@REM
13+
@REM Unless required by applicable law or agreed to in writing,
14+
@REM software distributed under the License is distributed on an
15+
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
@REM KIND, either express or implied. See the License for the
17+
@REM specific language governing permissions and limitations
18+
@REM under the License.
19+
@REM ----------------------------------------------------------------------------
20+
21+
@REM ----------------------------------------------------------------------------
22+
@REM Apache Maven Wrapper startup batch script, version 3.3.2
23+
@REM
24+
@REM Optional ENV vars
25+
@REM MVNW_REPOURL - repo url base for downloading maven distribution
26+
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
27+
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
28+
@REM ----------------------------------------------------------------------------
29+
30+
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
31+
@SET __MVNW_CMD__=
32+
@SET __MVNW_ERROR__=
33+
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
34+
@SET PSModulePath=
35+
@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 @(
36+
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
37+
)
38+
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
39+
@SET __MVNW_PSMODULEP_SAVE=
40+
@SET __MVNW_ARG0_NAME__=
41+
@SET MVNW_USERNAME=
42+
@SET MVNW_PASSWORD=
43+
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
44+
@echo Cannot start maven from wrapper >&2 && exit /b 1
45+
@GOTO :EOF
46+
: end batch / begin powershell #>
47+
48+
$ErrorActionPreference = "Stop"
49+
if ($env:MVNW_VERBOSE -eq "true") {
50+
$VerbosePreference = "Continue"
51+
}
52+
53+
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
54+
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
55+
if (!$distributionUrl) {
56+
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
57+
}
58+
59+
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
60+
"maven-mvnd-*" {
61+
$USE_MVND = $true
62+
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
63+
$MVN_CMD = "mvnd.cmd"
64+
break
65+
}
66+
default {
67+
$USE_MVND = $false
68+
$MVN_CMD = $script -replace '^mvnw','mvn'
69+
break
70+
}
71+
}
72+
73+
# apply MVNW_REPOURL and calculate MAVEN_HOME
74+
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
75+
if ($env:MVNW_REPOURL) {
76+
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
77+
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
78+
}
79+
$distributionUrlName = $distributionUrl -replace '^.*/',''
80+
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
81+
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
82+
if ($env:MAVEN_USER_HOME) {
83+
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
84+
}
85+
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
86+
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
87+
88+
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
89+
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
90+
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
91+
exit $?
92+
}
93+
94+
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
95+
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
96+
}
97+
98+
# prepare tmp dir
99+
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
100+
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
101+
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
102+
trap {
103+
if ($TMP_DOWNLOAD_DIR.Exists) {
104+
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
105+
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
106+
}
107+
}
108+
109+
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
110+
111+
# Download and Install Apache Maven
112+
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
113+
Write-Verbose "Downloading from: $distributionUrl"
114+
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
115+
116+
$webclient = New-Object System.Net.WebClient
117+
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
118+
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
119+
}
120+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
121+
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
122+
123+
# If specified, validate the SHA-256 sum of the Maven distribution zip file
124+
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
125+
if ($distributionSha256Sum) {
126+
if ($USE_MVND) {
127+
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
128+
}
129+
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
130+
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
131+
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."
132+
}
133+
}
134+
135+
# unzip and move
136+
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
137+
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
138+
try {
139+
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
140+
} catch {
141+
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
142+
Write-Error "fail to move MAVEN_HOME"
143+
}
144+
} finally {
145+
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
146+
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
147+
}
148+
149+
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

0 commit comments

Comments
 (0)