Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbien merged 3 commits into from
Jan 7, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6627c2
fix "ordered comparison of pointer with integer zero" compiler error
mbien Dec 15, 2024
e2e7daa
Remove java.security.manager=allow flag from windows launcher.
mbien Oct 15, 2024
272ebc2
Bump launcher version to 2.0.0
mbien Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nb/ide.launcher/windows/netbeans.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

-->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="101.1.0.0"
<assemblyIdentity version="101.2.0.0"
processorArchitecture="x86"
name="netbeans.exe"
type="win32"/>
Expand Down
2 changes: 1 addition & 1 deletion nb/ide.launcher/windows/netbeans64.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- Use processorArchitecture="x86", which is the value used by the 64-bit
javaw.exe on Java 10.0.2 and Java 11ea. -->
<assemblyIdentity version="101.1.0.0"
<assemblyIdentity version="101.2.0.0"
processorArchitecture="x86"
name="netbeans64.exe"
type="win32"/>
Expand Down
6 changes: 3 additions & 3 deletions nb/ide.launcher/windows/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#define COMPANY ""
#define COMPONENT "Apache NetBeans IDE Launcher"
#define VER "101.1.0.0"
#define FVER 101,1,0,0
#define BUILD_ID "101100"
#define VER "101.2.0.0"
#define FVER 101,2,0,0
#define BUILD_ID "101200"
#define INTERNAL_NAME "netbeans"
#define COPYRIGHT "Based on Apache NetBeans from the Apache Software Foundation and is licensed under Apache License Version 2.0"
#define NAME "Apache NetBeans IDE Launcher"
Expand Down
2 changes: 1 addition & 1 deletion platform/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ bool JvmLauncher::startInProcJvm(const char *mainClassName, const std::list<std:
for (list<string>::const_iterator it = options.begin(); it != options.end(); ++it, ++i) {
const string &option = *it;
logMsg("\t%s", option.c_str());
if (option.find("-splash:") == 0 && hSplash > 0) {
if (option.find("-splash:") == 0 && hSplash != nullptr) {
const string splash = option.substr(8);
logMsg("splash at %s", splash.c_str());

Expand Down
2 changes: 1 addition & 1 deletion platform/o.n.bootstrap/launcher/windows/nbexec.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

-->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="101.1.0.0"
<assemblyIdentity version="101.2.0.0"
processorArchitecture="X86"
name="nbexec.exe"
type="win32"/>
Expand Down
3 changes: 0 additions & 3 deletions platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:";
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion platform/o.n.bootstrap/launcher/windows/platformlauncher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions platform/o.n.bootstrap/launcher/windows/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0.0"
#define FVER 101,2,0,0
#define BUILD_ID "101200"
#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"
Expand Down
Loading