From d73956be7b9e73526f6ca5c50a9c2f14e073af2c Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 15 Oct 2024 16:23:20 +0200 Subject: [PATCH] Remove java.security.manager=allow flag from launcher. this commit implements SM removal step 1 of 3 1) remove SM flag from launcher and release new launcher bits 2) move flag to config and switch to new launcher bits 3) implement SM removal for JDK 24 compatibility --- platform/o.n.bootstrap/launcher/unix/nbexec | 2 +- platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec index 1d6ad6e53019..228b37cbe20d 100755 --- a/platform/o.n.bootstrap/launcher/unix/nbexec +++ b/platform/o.n.bootstrap/launcher/unix/nbexec @@ -192,7 +192,7 @@ fi # rename old heap dump to .old mv "${userdir}/var/log/heapdump.hprof" "${userdir}/var/log/heapdump.hprof.old" > /dev/null 2>&1 -jargs_without_clusters="$jargs -Djava.security.manager=allow" +jargs_without_clusters="$jargs" jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters" if [ -z "$cachedirspecified" ]; then diff --git a/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp b/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp index 33bf8ee83ec2..95b4981194f7 100644 --- a/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp +++ b/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp @@ -579,8 +579,6 @@ void PlatformLauncher::prepareOptions() { option = OPT_KEEP_WORKING_SET_ON_MINIMIZE; javaOptions.push_back(option); - option = OPT_JAVA_SECURITY_MANAGER_ALLOW; - javaOptions.push_back(option); } string & PlatformLauncher::constructClassPath(bool runUpdater) {