[MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script improperly handles two options at once

This closes #518

apache-maven/src/assembly/shared/init

@@ -1,3 +1,5 @@
+CLASSWORLDS_CONF="${MAVEN_HOME}/bin/m2.conf"
+
 # For Cygwin, ensure paths are in Unix format before anything is touched
 if $cygwin ; then
   [ -n "$MAVEN_HOME" ] &&

apache-maven/src/assembly/shared/init.cmd

@@ -2,6 +2,8 @@
 
 :init
 
+set "CLASSWORLDS_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.
 

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}"`
 

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%"
 

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=
 

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=
 

apache-maven/src/assembly/shared/run

@@ -14,6 +14,7 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "${LAUNCHER_JAR}" \
-  $MAVENHOME_CONFIG \
+  "-Dclassworlds.conf=$CLASSWORLDS_CONF" \
+  "-Dmaven.home=$MAVEN_HOME" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   $MAVEN_LAUNCHER "$@"

apache-maven/src/assembly/shared/run.cmd

@@ -3,7 +3,8 @@
   %MAVEN_OPTS% ^
   %MAVEN_DEBUG_OPTS% ^
   -classpath %LAUNCHER_JAR% ^
-  %MAVENHOME_CONFIG% ^
+  "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
+  "-Dmaven.home=%MAVEN_HOME%" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %MAVEN_LAUNCHER% %*
 if ERRORLEVEL 1 goto error