You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/03/05 23:11:39 UTC
[maven] 01/01: [MNG-7206] Properly prioritize JVM options from MAVEN_OPTS and jvm.config
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7206
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e8c35ae4ab91270b4403b95468254f0978f1c0ca
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 20 22:40:33 2021 +0100
[MNG-7206] Properly prioritize JVM options from MAVEN_OPTS and jvm.config
This closes #638
---
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/init.cmd | 7 +++----
apache-maven/src/assembly/shared/run.cmd | 1 -
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 619bc4d..d5bd529 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -83,4 +83,4 @@ concat_lines() {
}
MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
-MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
+MAVEN_OPTS="$MAVEN_OPTS `concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"`"
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index aac92a6..019e4b8 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -83,12 +83,11 @@ cd /d "%EXEC_DIR%"
:endDetectBaseDir
-set "jvmConfig=\.mvn\jvm.config"
-if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadJvmConfig
+if not exist "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadJvmConfig
@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_OPTS=!JVM_CONFIG_MAVEN_OPTS! %%a
+@endlocal & set MAVEN_OPTS=%MAVEN_OPTS% %JVM_CONFIG_MAVEN_OPTS%
:endReadJvmConfig
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
index 71a9c05..75de39a 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -1,5 +1,4 @@
"%JAVACMD%" ^
- %JVM_CONFIG_MAVEN_PROPS% ^
%MAVEN_OPTS% ^
%MAVEN_DEBUG_OPTS% ^
-classpath %LAUNCHER_JAR% ^