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 a4078ee616f6323a60aa1afb34a516b108e541f7 Author: Michael Osipov <[email protected]> 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 | 8 ++++++++ 2 files changed, 9 insertions(+) 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 aac92a6..d1f6988 100755 --- a/apache-maven/src/assembly/shared/init.cmd +++ b/apache-maven/src/assembly/shared/init.cmd @@ -92,3 +92,11 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s :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
