Fix Windows batch file handling of pipe symbols in JVM config

The previous approach of escaping pipe symbols with ^ was insufficient
because Windows batch files interpret pipe symbols as command separators
even when escaped, causing commands like '*.de' to be executed.

This change implements a safer approach:

1. JvmConfigParser.java now outputs each JVM argument on a separate line
   instead of trying to escape pipe symbols on a single line

2. mvn.cmd creates a temporary batch file that includes the JVM config
   arguments line by line, avoiding command line parsing issues with
   pipe symbols

3. The temporary batch file is executed with the Maven arguments,
   ensuring pipe symbols in JVM config are passed correctly to the
   Java process

This approach completely avoids Windows command line parsing issues
with pipe symbols while maintaining compatibility with Linux systems.

Author: gnodet

apache-maven/src/assembly/maven/bin/JvmConfigParser.java

@@ -74,14 +74,12 @@ public static void main(String[] args) {
                 // Parse line into individual arguments (split on spaces, respecting quotes)
                 List<String> parsed = parseArguments(line);
 
-                // Append each argument quoted and escape pipe symbols for Windows batch
+                // Output each argument on a separate line to avoid Windows batch parsing issues
                 for (String arg : parsed) {
                     if (result.length() > 0) {
-                        result.append(' ');
+                        result.append('\n');
                     }
-                    // Escape pipe symbols for Windows batch file processing
-                    String escapedArg = arg.replace("|", "^|");
-                    result.append('"').append(escapedArg).append('"');
+                    result.append(arg);
                 }
             });
 

apache-maven/src/assembly/maven/bin/mvn.cmd

@@ -183,9 +183,15 @@ rem Use Java to parse jvm.config to avoid batch script parsing issues with speci
 rem This handles pipes, quotes, and other special characters correctly
 set "JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt"
 "%JAVACMD%" "%MAVEN_HOME%\bin\JvmConfigParser.java" "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2>nul
-rem Read the single line from temp file
-set /p JVM_CONFIG_MAVEN_OPTS=<"%JVM_CONFIG_TEMP%"
-del "%JVM_CONFIG_TEMP%" 2>nul
+
+rem Check if the temp file has content
+for %%A in ("%JVM_CONFIG_TEMP%") do set JVM_CONFIG_SIZE=%%~zA
+if not "%JVM_CONFIG_SIZE%"=="0" (
+    set "HAS_JVM_CONFIG=true"
+) else (
+    set "HAS_JVM_CONFIG=false"
+    del "%JVM_CONFIG_TEMP%" 2>nul
+)
 
 :endReadJvmConfig
 
@@ -228,21 +234,57 @@ for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
 set LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
 if "%MAVEN_MAIN_CLASS%"=="" @set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
 
-"%JAVACMD%" ^
-  %INTERNAL_MAVEN_OPTS% ^
-  %MAVEN_OPTS% ^
-  %JVM_CONFIG_MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  --enable-native-access=ALL-UNNAMED ^
-  -classpath %LAUNCHER_JAR% ^
-  "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
-  "-Dmaven.home=%MAVEN_HOME%" ^
-  "-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
-  "-Dlibrary.jline.path=%MAVEN_HOME%\lib\jline-native" ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %LAUNCHER_CLASS% ^
-  %MAVEN_ARGS% ^
-  %*
+if "%HAS_JVM_CONFIG%"=="true" (
+  rem Create a temporary batch file to execute Java with JVM config arguments
+  setlocal EnableDelayedExpansion
+  set "JVM_EXEC_TEMP=%TEMP%\mvn-jvm-exec-%RANDOM%.cmd"
+  echo @echo off > "!JVM_EXEC_TEMP!"
+  echo "%JAVACMD%" ^ >> "!JVM_EXEC_TEMP!"
+  if not "%INTERNAL_MAVEN_OPTS%"=="" echo   %INTERNAL_MAVEN_OPTS% ^ >> "!JVM_EXEC_TEMP!"
+  if not "%MAVEN_OPTS%"=="" echo   %MAVEN_OPTS% ^ >> "!JVM_EXEC_TEMP!"
+  rem Add JVM config arguments line by line
+  for /f "usebackq delims=" %%i in ("%JVM_CONFIG_TEMP%") do (
+    echo   "%%i" ^ >> "!JVM_EXEC_TEMP!"
+  )
+  if not "%MAVEN_DEBUG_OPTS%"=="" echo   %MAVEN_DEBUG_OPTS% ^ >> "!JVM_EXEC_TEMP!"
+  echo   --enable-native-access=ALL-UNNAMED ^ >> "!JVM_EXEC_TEMP!"
+  echo   -classpath %LAUNCHER_JAR% ^ >> "!JVM_EXEC_TEMP!"
+  echo   "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^ >> "!JVM_EXEC_TEMP!"
+  echo   "-Dmaven.home=%MAVEN_HOME%" ^ >> "!JVM_EXEC_TEMP!"
+  echo   "-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^ >> "!JVM_EXEC_TEMP!"
+  echo   "-Dlibrary.jline.path=%MAVEN_HOME%\lib\jline-native" ^ >> "!JVM_EXEC_TEMP!"
+  echo   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ >> "!JVM_EXEC_TEMP!"
+  echo   %LAUNCHER_CLASS% ^ >> "!JVM_EXEC_TEMP!"
+  if not "%MAVEN_ARGS%"=="" echo   %MAVEN_ARGS% ^ >> "!JVM_EXEC_TEMP!"
+  echo   %%* >> "!JVM_EXEC_TEMP!"
+
+  rem Execute the temporary batch file
+  call "!JVM_EXEC_TEMP!" %*
+  set JAVA_EXIT_CODE=!ERRORLEVEL!
+
+  rem Clean up temporary files
+  del "%JVM_CONFIG_TEMP%" 2>nul
+  del "!JVM_EXEC_TEMP!" 2>nul
+
+  endlocal & set ERROR_CODE=%JAVA_EXIT_CODE%
+  if %ERROR_CODE% NEQ 0 goto error
+) else (
+  "%JAVACMD%" ^
+    %INTERNAL_MAVEN_OPTS% ^
+    %MAVEN_OPTS% ^
+    %MAVEN_DEBUG_OPTS% ^
+    --enable-native-access=ALL-UNNAMED ^
+    -classpath %LAUNCHER_JAR% ^
+    "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
+    "-Dmaven.home=%MAVEN_HOME%" ^
+    "-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
+    "-Dlibrary.jline.path=%MAVEN_HOME%\lib\jline-native" ^
+    "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+    %LAUNCHER_CLASS% ^
+    %MAVEN_ARGS% ^
+    %*
+  if ERRORLEVEL 1 goto error
+)
 if ERRORLEVEL 1 goto error
 goto end