diff --git a/java-latest-ea-ci.xml b/java-latest-ea-ci.xml new file mode 100644 index 0000000000..70e6f2e493 --- /dev/null +++ b/java-latest-ea-ci.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/script/ant b/src/script/ant index a160a7287e..b3b4c0ae1e 100644 --- a/src/script/ant +++ b/src/script/ant @@ -370,7 +370,7 @@ else fi # Run "java -XshowSettings:properties" and check the output for "java.specification.version" value JAVA_SPEC_VERSION=`"$JAVACMD" -XshowSettings:properties 2>&1 | grep "java.specification.version = " | tr -d '[:space:]'` -if [ "$JAVA_SPEC_VERSION" = "java.specification.version=18" ]; then +if [ "$JAVA_SPEC_VERSION" = "java.specification.version=18" ] || [ "$JAVA_SPEC_VERSION" = "java.specification.version=19" ]; then # set security manager property to allow calls to System.setSecurityManager() at runtime ANT_OPTS="$ANT_OPTS -Djava.security.manager=allow" fi diff --git a/src/script/ant.bat b/src/script/ant.bat index 0cdaf1b720..58dc3db868 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -123,11 +123,19 @@ goto setSecurityManagerOpt if "%_JAVACMD%" == "" set _JAVACMD=java.exe :setSecurityManagerOpt -"%_JAVACMD%" -XshowSettings:properties 2>&1 | find "java.specification.version = 18" -if %errorlevel% EQU 0 ( -rem This is Java 18, so set -Djava.security.manager=allow -set ANT_OPTS=%ANT_OPTS% -Djava.security.manager=allow +setlocal EnableDelayedExpansion +"!_JAVACMD!" -XshowSettings:properties 2>&1 | find "java.specification.version = 18" >nul 2>&1 +if !errorlevel! EQU 0 ( + rem This is Java 18, so set -Djava.security.manager=allow + set JAVA_SECMGR_OPT=-Djava.security.manager=allow +) else ( + "!_JAVACMD!" -XshowSettings:properties 2>&1 | find "java.specification.version = 19" >nul 2>&1 + if !errorlevel! EQU 0 ( + rem This is Java 19, so set -Djava.security.manager=allow + set JAVA_SECMGR_OPT=-Djava.security.manager=allow + ) ) +endlocal & set "ANT_OPTS=%ANT_OPTS% %JAVA_SECMGR_OPT%" :checkJikes if not "%JIKESPATH%"=="" goto runAntWithJikes