Bug 575210 - [17-18] JEP 411-393: Deprecate the Security Manager for
Removal
Change-Id: I5848f0c530a4e7f3c5a261012726460b85c074d4
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform/+/190769
Tested-by: Sarika Sinha <sarika.sinha@in.ibm.com>
Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>
diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
index 01db6f9..c09cea6 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
@@ -141,6 +141,14 @@
}
}
}
+ if (vmver == null) {
+ IVMInstall vm = JavaRuntime.getDefaultVMInstall();
+ if (vm instanceof AbstractVMInstall) {
+ AbstractVMInstall install = (AbstractVMInstall) vm;
+ vmver = install.getJavaVersion();
+ }
+
+ }
if (monitor.isCanceled()) {
return;
}
@@ -450,7 +458,8 @@
commandLine.append(antHome);
commandLine.append('\"');
}
- if (vmver != null && JavaCore.compareJavaVersions(vmver, JavaCore.VERSION_17) >= 0) {
+ if (vmver != null && JavaCore.compareJavaVersions(vmver, JavaCore.VERSION_17) >= 0
+ && commandLine.indexOf("-Djava.security.manager=allow") == -1) { //$NON-NLS-1$
commandLine.append(" \"-Djava.security.manager=allow\""); //$NON-NLS-1$
}
