diff --git a/config_host.mk.in b/config_host.mk.in index 2ab62f748bd6..deafc48737d3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -382,7 +382,6 @@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ export JAWTLIB=@JAWTLIB@ export JDK=@JDK@ export JDK_FOR_BUILD=@JDK_FOR_BUILD@ -export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@ export JFREEREPORT_JAR=@JFREEREPORT_JAR@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@ JOM=@JOM@ diff --git a/configure.ac b/configure.ac index b4c4cfecf2e2..37dff9cb0d54 100644 --- a/configure.ac +++ b/configure.ac @@ -6236,7 +6236,6 @@ if test "$cross_compiling" = "yes"; then JAVA_HOME JAVAIFLAGS JDK - JDK_SECURITYMANAGER_DISALLOWED LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER @@ -9081,7 +9080,6 @@ dnl =================================================================== # Whether all the complexity here actually is needed any more or not, no idea. -JDK_SECURITYMANAGER_DISALLOWED= MODULAR_JAVA= if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then _gij_longver=0 @@ -9106,12 +9104,6 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then if test "$_jdk_ver" -lt 10800; then AC_MSG_ERROR([JDK is too old, you need at least 8 ($_jdk_ver < 10800)]) fi - dnl TODO: Presumably, the Security Manager will not merely be disallowed, but be - dnl completely removed in some Java version > 18 (see - dnl "Deprecate the Security Manager for Removal"): - if test "$_jdk_ver" -ge 180000; then - JDK_SECURITYMANAGER_DISALLOWED=TRUE - fi JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` if test "$_os" = "WINNT"; then @@ -9421,7 +9413,6 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then JAVA_HOME_FOR_BUILD=$JAVA_HOME JAVAIFLAGS_FOR_BUILD=$JAVAIFLAGS JDK_FOR_BUILD=$JDK - JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=$JDK_SECURITYMANAGER_DISALLOWED fi AC_SUBST(JAVACFLAGS) @@ -9433,7 +9424,6 @@ AC_SUBST(JAVA_HOME) AC_SUBST(JAVA_HOME_FOR_BUILD) AC_SUBST(JDK) AC_SUBST(JDK_FOR_BUILD) -AC_SUBST(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD) AC_SUBST(JAVA_SOURCE_VER) AC_SUBST(JAVA_TARGET_VER) AC_SUBST(MODULAR_JAVA) diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk index 4e5c750c7f3c..a3dfcade6b87 100644 --- a/external/hsqldb/ExternalProject_hsqldb.mk +++ b/external/hsqldb/ExternalProject_hsqldb.mk @@ -22,8 +22,6 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) : $(call gb_Trace_StartRange,hsqldb,EXTERNAL) $(call gb_ExternalProject_run,build,\ unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \ - $(if $(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD), \ - ANT_OPTS="$$ANT_OPTS -Djava.security.manager=allow") \ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ -f build/build.xml \