This is an automated email from the ASF dual-hosted git repository.
jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new 958295a76 bz-67417 Undo (leftover) security manager system property
changes in ant.bat
958295a76 is described below
commit 958295a76a8d1c900442695676874f4071887691
Author: Jaikiran Pai <[email protected]>
AuthorDate: Sat Sep 16 12:42:23 2023 +0530
bz-67417 Undo (leftover) security manager system property changes in ant.bat
---
src/script/ant.bat | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/script/ant.bat b/src/script/ant.bat
index 58dc3db86..553af258c 100755
--- 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
