[gh-11363] Output one argument per line and quote each individually

The Java parser now outputs one argument per line.
The batch script reads each line and quotes it individually.
This prevents pipes and other special characters from being
interpreted as command separators.

Author: gnodet

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

@@ -27,10 +27,10 @@
 /**
  * Parses .mvn/jvm.config file for Windows batch scripts.
  * This avoids the complexity of parsing special characters (pipes, quotes, etc.) in batch scripts.
- * 
+ *
  * Usage: java JvmConfigParser.java <jvm.config-path> <maven-project-basedir>
- * 
- * Outputs: Space-separated JVM arguments with proper escaping for batch scripts
+ *
+ * Outputs: One argument per line (for safe batch script processing)
  */
 public class JvmConfigParser {
     public static void main(String[] args) {
@@ -48,35 +48,28 @@ public static void main(String[] args) {
         }
 
         try (Stream<String> lines = Files.lines(jvmConfigPath, StandardCharsets.UTF_8)) {
-            StringBuilder result = new StringBuilder();
-            
             lines.forEach(line -> {
                 // Remove comments
                 int commentIndex = line.indexOf('#');
                 if (commentIndex >= 0) {
                     line = line.substring(0, commentIndex);
                 }
-                
+
                 // Trim whitespace
                 line = line.trim();
-                
+
                 // Skip empty lines
                 if (line.isEmpty()) {
                     return;
                 }
-                
+
                 // Replace MAVEN_PROJECTBASEDIR placeholders
                 line = line.replace("${MAVEN_PROJECTBASEDIR}", mavenProjectBasedir);
                 line = line.replace("$MAVEN_PROJECTBASEDIR", mavenProjectBasedir);
-                
-                // Append to result with space separator
-                if (result.length() > 0) {
-                    result.append(' ');
-                }
-                result.append(line);
+
+                // Output each line separately (one argument per line)
+                System.out.println(line);
             });
-            
-            System.out.print(result.toString());
         } catch (IOException e) {
             System.err.println("Error reading jvm.config: " + e.getMessage());
             System.exit(1);

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

@@ -185,10 +185,16 @@ rem Compile the parser if not already compiled
 if not exist %MAVEN_HOME%\bin\JvmConfigParser.class (
     %JAVACMD:java.exe=javac.exe% -d %MAVEN_HOME%\bin %MAVEN_HOME%\bin\JvmConfigParser.java >nul 2>&1
 )
-rem Run the parser and save output to temp file to avoid pipe interpretation issues
+rem Run the parser and save output to temp file (one argument per line)
 set JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt
 %JAVACMD% -cp %MAVEN_HOME%\bin JvmConfigParser %MAVEN_PROJECTBASEDIR%\.mvn\jvm.config %MAVEN_PROJECTBASEDIR% > %JVM_CONFIG_TEMP% 2>nul
-set /p JVM_CONFIG_MAVEN_OPTS=<%JVM_CONFIG_TEMP%
+rem Read each line and append to JVM_CONFIG_MAVEN_OPTS with proper quoting
+@setlocal EnableDelayedExpansion
+set JVM_CONFIG_MAVEN_OPTS=
+for /f "usebackq delims=" %%a in (%JVM_CONFIG_TEMP%) do (
+    set JVM_CONFIG_MAVEN_OPTS=!JVM_CONFIG_MAVEN_OPTS! "%%a"
+)
+@endlocal & set JVM_CONFIG_MAVEN_OPTS=%JVM_CONFIG_MAVEN_OPTS%
 del %JVM_CONFIG_TEMP% 2>nul
 
 :endReadJvmConfig