bz-67417 Undo (leftover) security manager system property changes in …

…ant.bat
diffblue · Sep 16, 2023 · 958295a · 958295a
1 parent 53e9042
commit 958295a
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/src/script/ant.bat b/src/script/ant.bat
@@ -117,26 +117,11 @@ set _JAVACMD=%JAVACMD%
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto setSecurityManagerOpt
+goto checkJikes
 
 :noJavaHome
 if "%_JAVACMD%" == "" set _JAVACMD=java.exe
 
-:setSecurityManagerOpt
-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