diff --git a/build.xml b/build.xml index faf2fa3..6d08bdb 100644 --- a/build.xml +++ b/build.xml @@ -65,6 +65,7 @@ patches/remove-db.diff patches/nbjavac-not-required.diff patches/l10n-licence.diff + patches/no-security-manager-allow.diff @@ -109,6 +110,8 @@ + + diff --git a/patches/no-security-manager-allow.diff b/patches/no-security-manager-allow.diff new file mode 100644 index 0000000..561a0f4 --- /dev/null +++ b/patches/no-security-manager-allow.diff @@ -0,0 +1,13 @@ +diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec +index 1d6ad6e530..228b37cbe2 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/vscode/src/lsp/launchOptions.ts b/vscode/src/lsp/launchOptions.ts index d104414..6d6bd2e 100644 --- a/vscode/src/lsp/launchOptions.ts +++ b/vscode/src/lsp/launchOptions.ts @@ -53,7 +53,8 @@ const extraLaunchOptions = [ "-J-XX:PerfMaxStringConstLength=10240", "--locale", l10n.nbLocaleCode(), "--start-java-language-server=listen-hash:0", - "--start-java-debug-adapter-server=listen-hash:0" + "--start-java-debug-adapter-server=listen-hash:0", + "-J-DTopSecurityManager.disable=true" ]; const prepareUserConfigLaunchOptions = (): string[] => {