Skip to content

Commit cece6df

Browse files
committed
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
1 parent 4c4ed50 commit cece6df

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

nb/ide.launcher/windows/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#define COMPANY ""
2121
#define COMPONENT "Apache NetBeans IDE Launcher"
22-
#define VER "101.1.0.0"
23-
#define FVER 101,1,0,0
24-
#define BUILD_ID "101100"
22+
#define VER "101.1.1.0"
23+
#define FVER 101,1,1,0
24+
#define BUILD_ID "101110"
2525
#define INTERNAL_NAME "netbeans"
2626
#define COPYRIGHT "Based on Apache NetBeans from the Apache Software Foundation and is licensed under Apache License Version 2.0"
2727
#define NAME "Apache NetBeans IDE Launcher"

platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ const char *PlatformLauncher::OPT_NB_USERDIR = "-Dnetbeans.user=";
5252
const char *PlatformLauncher::OPT_DEFAULT_USERDIR_ROOT = "-Dnetbeans.default_userdir_root=";
5353
const char *PlatformLauncher::OPT_HEAP_DUMP = "-XX:+HeapDumpOnOutOfMemoryError";
5454
const char *PlatformLauncher::OPT_HEAP_DUMP_PATH = "-XX:HeapDumpPath=";
55-
const char *PlatformLauncher::OPT_JAVA_SECURITY_MANAGER_ALLOW = "-Djava.security.manager=allow";
5655
const char *PlatformLauncher::OPT_KEEP_WORKING_SET_ON_MINIMIZE = "-Dsun.awt.keepWorkingSetOnMinimize=true";
5756
const char *PlatformLauncher::OPT_CLASS_PATH = "-Djava.class.path=";
5857
const char *PlatformLauncher::OPT_SPLASH = "-splash:";
@@ -579,8 +578,6 @@ void PlatformLauncher::prepareOptions() {
579578
option = OPT_KEEP_WORKING_SET_ON_MINIMIZE;
580579
javaOptions.push_back(option);
581580

582-
option = OPT_JAVA_SECURITY_MANAGER_ALLOW;
583-
javaOptions.push_back(option);
584581
}
585582

586583
string & PlatformLauncher::constructClassPath(bool runUpdater) {

platform/o.n.bootstrap/launcher/windows/platformlauncher.h

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class PlatformLauncher {
4242
static const char *OPT_DEFAULT_USERDIR_ROOT;
4343
static const char *OPT_HEAP_DUMP;
4444
static const char *OPT_HEAP_DUMP_PATH;
45-
static const char *OPT_JAVA_SECURITY_MANAGER_ALLOW;
4645
static const char *OPT_KEEP_WORKING_SET_ON_MINIMIZE;
4746
static const char *OPT_CLASS_PATH;
4847
static const char *OPT_SPLASH;

platform/o.n.bootstrap/launcher/windows/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#define COMPANY ""
2121
#define COMPONENT "Apache NetBeans Platform Launcher"
22-
#define VER "101.1.0.0"
23-
#define FVER 101,1,0,0
24-
#define BUILD_ID "101100"
22+
#define VER "101.1.1.0"
23+
#define FVER 101,1,1,0
24+
#define BUILD_ID "101110"
2525
#define INTERNAL_NAME "nbexec"
2626
#define COPYRIGHT "Based on Apache NetBeans from the Apache Software Foundation and is licensed under Apache License Version 2.0"
2727
#define NAME "Apache NetBeans Platform Launcher"

0 commit comments

Comments
 (0)