Skip to content

Commit 178c6fa

Browse files
committed
Revert "[apachegh-11363] Remove debug output, ready for merge"
This reverts commit 199b457.
1 parent 199b457 commit 178c6fa

File tree

1 file changed

+10
-2
lines changed
  • apache-maven/src/assembly/maven/bin

1 file changed

+10
-2
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,23 @@ rem Use Java to parse jvm.config to avoid batch script parsing issues with speci
186186
rem This handles pipes, quotes, and other special characters correctly
187187
rem Use random temp directory to avoid conflicts between different Maven versions
188188
set "JVM_CONFIG_PARSER_DIR=%TEMP%\mvn-jvm-parser-%RANDOM%-%RANDOM%"
189-
mkdir "%JVM_CONFIG_PARSER_DIR%" 2>nul
189+
mkdir "%JVM_CONFIG_PARSER_DIR%"
190190
set "JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt"
191+
set "JVM_CONFIG_ERR=%TEMP%\mvn-jvm-config-err-%RANDOM%.txt"
191192
"%JAVACMD:java.exe=javac.exe%" -d "%JVM_CONFIG_PARSER_DIR%" "%MAVEN_HOME%\bin\JvmConfigParser.java" >nul 2>&1
192-
"%JAVACMD%" -cp "%JVM_CONFIG_PARSER_DIR%" JvmConfigParser "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2>nul
193+
"%JAVACMD%" -cp "%JVM_CONFIG_PARSER_DIR%" JvmConfigParser "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2> "%JVM_CONFIG_ERR%"
193194
rem Read the single line from temp file
194195
set /p JVM_CONFIG_MAVEN_OPTS=<"%JVM_CONFIG_TEMP%"
195196

197+
rem Debug output to file for IT verification
198+
echo JVM_CONFIG_MAVEN_OPTS=%JVM_CONFIG_MAVEN_OPTS% > "%MAVEN_PROJECTBASEDIR%\mvn-debug.txt"
199+
echo MAVEN_OPTS=%MAVEN_OPTS% >> "%MAVEN_PROJECTBASEDIR%\mvn-debug.txt"
200+
echo PARSER_STDERR: >> "%MAVEN_PROJECTBASEDIR%\mvn-debug.txt"
201+
type "%JVM_CONFIG_ERR%" >> "%MAVEN_PROJECTBASEDIR%\mvn-debug.txt" 2>nul
202+
196203
rem Cleanup temp files and directory
197204
del "%JVM_CONFIG_TEMP%" 2>nul
205+
del "%JVM_CONFIG_ERR%" 2>nul
198206
rmdir /s /q "%JVM_CONFIG_PARSER_DIR%" 2>nul
199207

200208
:endReadJvmConfig

0 commit comments

Comments
 (0)