Skip to content

Commit

Permalink
Remove -Djava.security.manager=allow from the products
Browse files Browse the repository at this point in the history
- Define an unconfigure touchpoint to remove
-Djava.security.manager=allow from the eclipse.ini which is done to
ensure that updates will leave installations in a state that can run
with Java 24.
- Do the above for both products and ensure that both products specify
-Dosgi.requiredJavaVersion=21

#2623
  • Loading branch information
merks authored and akurtakov committed Dec 17, 2024
1 parent 3c95dc5 commit a44c18b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
instructions.configure=\
mkdir(path:${installFolder}/dropins);
mkdir(path:${installFolder}/dropins);\
removeJvmArg(jvmArg:-Djava.security.manager=allow);

# Restrict range so we are not an automatic update for 3.x.
update.id = org.eclipse.platform.ide
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<launcherArgs>
<programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=17 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off -Djava.security.manager=allow
<vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
</vmArgs>
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
instructions.configure=\
mkdir(path:${installFolder}/dropins);
mkdir(path:${installFolder}/dropins);\
removeJvmArg(jvmArg:-Djava.security.manager=allow);

# Restrict range so we are not an automatic update for 3.x.
update.id= org.eclipse.sdk.ide
Expand All @@ -13,4 +14,3 @@ properties.1.value = 4.35 Release of the Eclipse SDK.

properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<launcherArgs>
<programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off -Djava.security.manager=allow
<vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
</vmArgs>
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
Expand Down

0 comments on commit a44c18b

Please sign in to comment.