Remove java.security.manager=allow flag from windows launcher.

this commit implements SM removal step 1 of 3 1) remove SM flag from win 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
apache · Dec 4, 2024 · 9f80a3c · 9f80a3c
1 parent 4c4ed50
commit 9f80a3c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp b/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
@@ -52,7 +52,6 @@ const char *PlatformLauncher::OPT_NB_USERDIR = "-Dnetbeans.user=";
 const char *PlatformLauncher::OPT_DEFAULT_USERDIR_ROOT = "-Dnetbeans.default_userdir_root=";
 const char *PlatformLauncher::OPT_HEAP_DUMP = "-XX:+HeapDumpOnOutOfMemoryError";
 const char *PlatformLauncher::OPT_HEAP_DUMP_PATH = "-XX:HeapDumpPath=";
-const char *PlatformLauncher::OPT_JAVA_SECURITY_MANAGER_ALLOW = "-Djava.security.manager=allow";
 const char *PlatformLauncher::OPT_KEEP_WORKING_SET_ON_MINIMIZE = "-Dsun.awt.keepWorkingSetOnMinimize=true";
 const char *PlatformLauncher::OPT_CLASS_PATH = "-Djava.class.path=";
 const char *PlatformLauncher::OPT_SPLASH = "-splash:";
@@ -579,8 +578,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) {

diff --git a/platform/o.n.bootstrap/launcher/windows/platformlauncher.h b/platform/o.n.bootstrap/launcher/windows/platformlauncher.h
@@ -42,7 +42,6 @@ class PlatformLauncher {
     static const char *OPT_DEFAULT_USERDIR_ROOT;
     static const char *OPT_HEAP_DUMP;
     static const char *OPT_HEAP_DUMP_PATH;
-    static const char *OPT_JAVA_SECURITY_MANAGER_ALLOW;
     static const char *OPT_KEEP_WORKING_SET_ON_MINIMIZE;
     static const char *OPT_CLASS_PATH;
     static const char *OPT_SPLASH;

diff --git a/platform/o.n.bootstrap/launcher/windows/version.h b/platform/o.n.bootstrap/launcher/windows/version.h
@@ -19,9 +19,9 @@
 
 #define COMPANY ""
 #define COMPONENT "Apache NetBeans Platform Launcher"
-#define VER "101.1.0.0"
-#define FVER 101,1,0,0
-#define BUILD_ID "101100"
+#define VER "101.1.1.0"
+#define FVER 101,1,1,0
+#define BUILD_ID "101110"
 #define INTERNAL_NAME "nbexec"
 #define COPYRIGHT "Based on Apache NetBeans from the Apache Software Foundation and is licensed under Apache License Version 2.0"
 #define NAME "Apache NetBeans Platform Launcher"