Skip to content

Commit cdba8dd

Browse files
committed
Fix on windows
1 parent 892cb58 commit cdba8dd

File tree

1 file changed

+14
-5
lines changed
  • apache-maven/src/assembly/maven/bin

1 file changed

+14
-5
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,25 @@ if not exist "%JAVACMD%" (
7171
)
7272

7373
@REM Check Java version
74-
for /f "tokens=3" %%g in ('"%JAVACMD%" -version 2^>^&1 ^| findstr /i "version"') do (
74+
"%JAVACMD%" -version 2>&1 | "%SystemRoot%\System32\findstr.exe" /i /r "version[^0-9]*[0-9]" > "%TEMP%\mvn-java-version.txt"
75+
if ERRORLEVEL 1 (
76+
echo Error: Unable to determine Java version. >&2
77+
goto error
78+
)
79+
set /p JAVA_VERSION_LINE=<"%TEMP%\mvn-java-version.txt"
80+
del "%TEMP%\mvn-java-version.txt"
81+
82+
for /f "tokens=3" %%g in ("!JAVA_VERSION_LINE!") do (
7583
set JAVAVER=%%g
7684
)
77-
set JAVAVER=%JAVAVER:"=%
78-
for /f "delims=. tokens=1" %%v in ("%JAVAVER%") do (
85+
set JAVAVER=!JAVAVER:"=!
86+
for /f "delims=. tokens=1" %%v in ("!JAVAVER!") do (
7987
set JAVA_MAJOR_VERSION=%%v
8088
)
81-
if %JAVA_MAJOR_VERSION% LSS 17 (
89+
90+
if !JAVA_MAJOR_VERSION! LSS 17 (
8291
echo Error: Apache Maven 4.x requires Java 17 or newer to run. >&2
83-
echo Your current Java version appears to be %JAVAVER% >&2
92+
echo Your current Java version appears to be !JAVA_VERSION_LINE! >&2
8493
echo Please upgrade your Java installation or set JAVA_HOME to point to a compatible JDK. >&2
8594
goto error
8695
)

0 commit comments

Comments
 (0)