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 2021/10/24 18:02:34 UTC
[maven] 03/03: Update startup scripts
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 140f36c5318f36d24410f8bcae138952a86d576e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 24 20:02:20 2021 +0200
Update startup scripts
---
apache-maven/src/assembly/shared/init | 1 +
apache-maven/src/assembly/shared/init.cmd | 12 ++++++++++--
apache-maven/src/assembly/shared/run | 4 +++-
apache-maven/src/assembly/shared/run.cmd | 4 +++-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 619bc4d..d38f5db 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -84,3 +84,4 @@ concat_lines() {
MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
+MAVEN_ARGS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/maven.config"` $MAVEN_ARGS"
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index 8b1eb67..d1f6988 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -84,11 +84,19 @@ cd /d "%EXEC_DIR%"
:endDetectBaseDir
set "jvmConfig=\.mvn\jvm.config"
-if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
+if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" 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%
-:endReadAdditionalConfig
+:endReadJvmConfig
+set "mavenConfig=\.mvn\maven.config"
+if not exist "%MAVEN_PROJECTBASEDIR%%mavenConfig%" goto endReadMavenConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\maven.config") do set MAVEN_CONFIG_MAVEN_PROPS=!MAVEN_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set MAVEN_CONFIG_MAVEN_PROPS=%MAVEN_CONFIG_MAVEN_PROPS%
+
+:endReadMavenConfig
diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
index 69535d6..28814a8 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -16,4 +16,6 @@ exec "$JAVACMD" \
"-Dmaven.home=$MAVEN_HOME" \
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
"-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
- $LAUNCHER_CLASS "$@"
+ $LAUNCHER_CLASS \
+ $MAVEN_ARGS \
+ "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
index ac526f8..dd81c38 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -7,7 +7,9 @@
"-Dmaven.home=%MAVEN_HOME%" ^
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
- %LAUNCHER_CLASS% %*
+ %LAUNCHER_CLASS% ^
+ %MAVEN_CONFIG_MAVEN_PROPS% ^
+ %*
if ERRORLEVEL 1 goto error
goto end