Skip to content

Commit bd4b67d

Browse files
committed
[gh-11363] Fix javac invocation and remove unnecessary quotes
- Use javac (not java) with -d option to compile - Remove quotes that may cause issues in batch script
1 parent 1623c1d commit bd4b67d

File tree

1 file changed

+6
-6
lines changed
  • apache-maven/src/assembly/maven/bin

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ if not exist "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadJvmConfig
182182
rem Use Java to parse jvm.config to avoid batch script parsing issues with special characters
183183
rem This handles pipes, quotes, and other special characters correctly
184184
rem Compile the parser if not already compiled
185-
if not exist "%MAVEN_HOME%\bin\JvmConfigParser.class" (
186-
"%JAVACMD%" -d "%MAVEN_HOME%\bin" "%MAVEN_HOME%\bin\JvmConfigParser.java" >nul 2>&1
185+
if not exist %MAVEN_HOME%\bin\JvmConfigParser.class (
186+
%JAVACMD:java.exe=javac.exe% -d %MAVEN_HOME%\bin %MAVEN_HOME%\bin\JvmConfigParser.java >nul 2>&1
187187
)
188188
rem Run the parser and save output to temp file to avoid pipe interpretation issues
189-
set "JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt"
190-
"%JAVACMD%" -cp "%MAVEN_HOME%\bin" JvmConfigParser "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2>nul
191-
set /p JVM_CONFIG_MAVEN_OPTS=<"%JVM_CONFIG_TEMP%"
192-
del "%JVM_CONFIG_TEMP%" 2>nul
189+
set JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt
190+
%JAVACMD% -cp %MAVEN_HOME%\bin JvmConfigParser %MAVEN_PROJECTBASEDIR%\.mvn\jvm.config %MAVEN_PROJECTBASEDIR% > %JVM_CONFIG_TEMP% 2>nul
191+
set /p JVM_CONFIG_MAVEN_OPTS=<%JVM_CONFIG_TEMP%
192+
del %JVM_CONFIG_TEMP% 2>nul
193193

194194
:endReadJvmConfig
195195

0 commit comments

Comments
 (0)