Skip to content

Commit 14e6e90

Browse files
committed
Support Maven 4 by setting maven.mainClass to MavenCling
1 parent b4b8997 commit 14e6e90

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

maven-wrapper-distribution/src/resources/mvnw

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ fi
327327
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
328328
export MAVEN_CMD_LINE_ARGS
329329

330+
MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
330331
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
331332

332333
# shellcheck disable=SC2086 # safe args
@@ -335,4 +336,5 @@ exec "$JAVACMD" \
335336
$MAVEN_DEBUG_OPTS \
336337
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
337338
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
339+
"-Dmaven.mainClass=${MAVEN_MAIN_CLASS}" \
338340
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

maven-wrapper-distribution/src/resources/mvnw.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ 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+
set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
120121
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
121122

122123
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/@@project.version@@/maven-wrapper-@@project.version@@.jar"
@@ -182,6 +183,7 @@ set MAVEN_CMD_LINE_ARGS=%*
182183
%MAVEN_DEBUG_OPTS% ^
183184
-classpath %WRAPPER_JAR% ^
184185
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
186+
"-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
185187
%WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
186188
if ERRORLEVEL 1 goto error
187189
goto end

0 commit comments

Comments
 (0)