Skip to content

Commit 9e6ffa1

Browse files
Update dependency maven-wrapper to v3.3.4
1 parent 9274238 commit 9e6ffa1

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* https://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
1212
* Unless required by applicable law or agreed to in writing,
1313
* software distributed under the License is distributed on an
@@ -25,11 +25,12 @@
2525
import java.net.URL;
2626
import java.nio.file.Files;
2727
import java.nio.file.Path;
28+
import java.nio.file.Paths;
2829
import java.nio.file.StandardCopyOption;
2930
import java.util.concurrent.ThreadLocalRandom;
3031

3132
public final class MavenWrapperDownloader {
32-
private static final String WRAPPER_VERSION = "3.3.3";
33+
private static final String WRAPPER_VERSION = "3.3.4";
3334

3435
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
3536

@@ -44,7 +45,7 @@ public static void main(String[] args) {
4445
try {
4546
log(" - Downloader started");
4647
final URL wrapperUrl = URI.create(args[0]).toURL();
47-
final Path baseDir = Path.of(".").toAbsolutePath().normalize();
48+
final Path baseDir = Paths.get(".").toAbsolutePath().normalize();
4849
final Path wrapperJarPath = baseDir.resolve(args[1]).normalize();
4950
if (!wrapperJarPath.startsWith(baseDir)) {
5051
throw new IOException("Invalid path: outside of allowed directory");
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
wrapperVersion=3.3.4
12
distributionType=source
23
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
3-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar
4-
wrapperVersion=3.3.3
4+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

mvnw

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# "License"); you may not use this file except in compliance
99
# with the License. You may obtain a copy of the License at
1010
#
11-
# https://www.apache.org/licenses/LICENSE-2.0
11+
# http://www.apache.org/licenses/LICENSE-2.0
1212
#
1313
# Unless required by applicable law or agreed to in writing,
1414
# software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Apache Maven Wrapper startup batch script, version 3.3.3
22+
# Apache Maven Wrapper startup batch script, version 3.3.4
2323
#
2424
# Required ENV vars:
2525
# ------------------
@@ -220,9 +220,9 @@ else
220220
log "Couldn't find $wrapperJarPath, downloading it ..."
221221

222222
if [ -n "$MVNW_REPOURL" ]; then
223-
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar"
223+
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
224224
else
225-
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar"
225+
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
226226
fi
227227
while IFS="=" read -r key value; do
228228
case "$key" in wrapperUrl)
@@ -327,8 +327,6 @@ fi
327327
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
328328
export MAVEN_CMD_LINE_ARGS
329329

330-
# Maven main class is here to fix maven 4.0.0-beta-5 through 4.0.0-rc-4
331-
MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
332330
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
333331

334332
# shellcheck disable=SC2086 # safe args
@@ -337,5 +335,4 @@ exec "$JAVACMD" \
337335
$MAVEN_DEBUG_OPTS \
338336
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
339337
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
340-
"-Dmaven.mainClass=${MAVEN_MAIN_CLASS}" \
341338
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@REM "License"); you may not use this file except in compliance
88
@REM with the License. You may obtain a copy of the License at
99
@REM
10-
@REM https://www.apache.org/licenses/LICENSE-2.0
10+
@REM http://www.apache.org/licenses/LICENSE-2.0
1111
@REM
1212
@REM Unless required by applicable law or agreed to in writing,
1313
@REM software distributed under the License is distributed on an
@@ -18,7 +18,7 @@
1818
@REM ----------------------------------------------------------------------------
1919

2020
@REM ----------------------------------------------------------------------------
21-
@REM Apache Maven Wrapper startup batch script, version 3.3.3
21+
@REM Apache Maven Wrapper startup batch script, version 3.3.4
2222
@REM
2323
@REM Required ENV vars:
2424
@REM JAVA_HOME - location of a JDK home dir
@@ -117,12 +117,9 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
117117

118118
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
119119
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
120-
121-
@REM Maven main class is here to fix maven 4.0.0-beta-5 through 4.0.0-rc-4
122-
set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
123120
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
124121

125-
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar"
122+
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
126123

127124
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
128125
IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
@@ -136,7 +133,7 @@ if exist %WRAPPER_JAR% (
136133
)
137134
) else (
138135
if not "%MVNW_REPOURL%" == "" (
139-
SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar"
136+
SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
140137
)
141138
if "%MVNW_VERBOSE%" == "true" (
142139
echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -185,7 +182,6 @@ set MAVEN_CMD_LINE_ARGS=%*
185182
%MAVEN_DEBUG_OPTS% ^
186183
-classpath %WRAPPER_JAR% ^
187184
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
188-
"-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
189185
%WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
190186
if ERRORLEVEL 1 goto error
191187
goto end

0 commit comments

Comments
 (0)