Fix java

Author: gnodet

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

@@ -72,10 +72,10 @@ public static void main(String[] args) {
                 line = line.replace("$MAVEN_PROJECTBASEDIR", mavenProjectBasedir);
 
                 // Parse line into individual arguments (split on spaces, respecting quotes)
-                List<String> args = parseArguments(line);
+                List<String> parsed = parseArguments(line);
 
                 // Append each argument quoted
-                for (String arg : args) {
+                for (String arg : parsed) {
                     if (result.length() > 0) {
                         result.append(' ');
                     }

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

@@ -181,18 +181,8 @@ if not exist "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadJvmConfig
 
 rem Use Java to parse jvm.config to avoid batch script parsing issues with special characters
 rem This handles pipes, quotes, and other special characters correctly
-rem Compile to temp directory to avoid needing write access to bin directory
-rem Use a hash of MAVEN_HOME to create a unique directory per Maven installation
-set "MAVEN_HOME_HASH=%MAVEN_HOME:\=-%"
-set "MAVEN_HOME_HASH=%MAVEN_HOME_HASH::=%"
-set "MAVEN_HOME_HASH=%MAVEN_HOME_HASH: =%"
-set "JVM_CONFIG_PARSER_DIR=%TEMP%\mvn-jvm-parser-%MAVEN_HOME_HASH%"
-if not exist "%JVM_CONFIG_PARSER_DIR%\JvmConfigParser.class" (
-    if not exist "%JVM_CONFIG_PARSER_DIR%" mkdir "%JVM_CONFIG_PARSER_DIR%"
-    "%JAVACMD:java.exe=javac.exe%" -d "%JVM_CONFIG_PARSER_DIR%" "%MAVEN_HOME%\bin\JvmConfigParser.java" >nul 2>&1
-)
 set "JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt"
-"%JAVACMD%" -cp "%JVM_CONFIG_PARSER_DIR%" JvmConfigParser "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2>nul
+"%JAVACMD%" "%JAVA_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