This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7199
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e60d57edad1d3ac150dd9830e18f07dd0cdbefbb
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Jul 29 13:13:31 2021 +0200
First shot
---
apache-maven/src/assembly/shared/init | 2 ++
apache-maven/src/assembly/shared/init.cmd | 2 ++
apache-maven/src/assembly/shared/mvnlauncher | 1 -
apache-maven/src/assembly/shared/mvnlauncher.cmd | 1 -
apache-maven/src/assembly/shared/mvnwlauncher | 1 -
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 1 -
apache-maven/src/assembly/shared/run | 3 ++-
apache-maven/src/assembly/shared/run.cmd | 3 ++-
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/apache-maven/src/assembly/shared/init
b/apache-maven/src/assembly/shared/init
index 5b476ca..77559c4 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -1,3 +1,5 @@
+CLASSWOLRDS_CONF="${MAVEN_HOME}/bin/m2.conf"
+
# For Cygwin, ensure paths are in Unix format before anything is touched
if $cygwin ; then
[ -n "$MAVEN_HOME" ] &&
diff --git a/apache-maven/src/assembly/shared/init.cmd
b/apache-maven/src/assembly/shared/init.cmd
index 10758df..1307459 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -2,6 +2,8 @@
:init
+set "CLASSWOLRDS_CONF=%MAVEN_HOME%\bin\m2.conf"
+
@REM Find the project basedir, i.e., the directory that contains the directory
".mvn".
@REM Fallback to current working directory if not found.
diff --git a/apache-maven/src/assembly/shared/mvnlauncher
b/apache-maven/src/assembly/shared/mvnlauncher
index 9c84338..943239b 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -1,4 +1,3 @@
LAUNCHER_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-MAVENHOME_CONFIG=`echo "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf"
"-Dmaven.home=${MAVEN_HOME}"`
diff --git a/apache-maven/src/assembly/shared/mvnlauncher.cmd
b/apache-maven/src/assembly/shared/mvnlauncher.cmd
index d9a9687..be2f9a9 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnlauncher.cmd
@@ -1,4 +1,3 @@
for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
set MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-set MAVENHOME_CONFIG="-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf"
"-Dmaven.home=%MAVEN_HOME%"
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher
b/apache-maven/src/assembly/shared/mvnwlauncher
index dd690b6..39ba322 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher
+++ b/apache-maven/src/assembly/shared/mvnwlauncher
@@ -1,4 +1,3 @@
LAUNCHER_JAR="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-MAVENHOME_CONFIG=
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher.cmd
b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
index 9d9685d..46cad98 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
@@ -1,4 +1,3 @@
set LAUNCHER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set MAVENHOME_CONFIG=
diff --git a/apache-maven/src/assembly/shared/run
b/apache-maven/src/assembly/shared/run
index 55550eb..4444f4d 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -14,6 +14,7 @@ exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "${LAUNCHER_JAR}" \
- $MAVENHOME_CONFIG \
+ "-Dclassworlds.conf=$CLASSWOLRDS_CONF" \
+ "-Dmaven.home=$MAVEN_HOME" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
$MAVEN_LAUNCHER "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd
b/apache-maven/src/assembly/shared/run.cmd
index 1aeae16..36160bf 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -3,7 +3,8 @@
%MAVEN_OPTS% ^
%MAVEN_DEBUG_OPTS% ^
-classpath %LAUNCHER_JAR% ^
- %MAVENHOME_CONFIG% ^
+ "-Dclassworlds.conf=%CLASSWOLRDS_CONF%" ^
+ "-Dmaven.home=%MAVEN_HOME%" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%MAVEN_LAUNCHER% %*
if ERRORLEVEL 1 goto error
