Skip to content

Commit e5b746a

Browse files
authored
Remove @UpdateForV9 usages that are related to security manager removal (elastic#123690) (elastic#123858)
* Remove @UpdateForV9 annotation in RuntimeVersionFeature Re ES-10338 the Core/Infra team agreed that this is not blocked on security manager removal. We should go ahead and remove these 2 instances of the @UpdateForV9 annotation, the code will be cleaned up soon with the removal of Security Manager. * Remove @UpdateForV9 annotation from SystemJvmOptions re ES-10338 the Core/Infra team agreed this is not blocked on security manager removal. We should go ahead and remove this instance of the @UpdateForV9 annotation.
1 parent 2699d5c commit e5b746a

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.common.settings.Settings;
1313
import org.elasticsearch.common.util.concurrent.EsExecutors;
1414
import org.elasticsearch.core.Booleans;
15-
import org.elasticsearch.core.UpdateForV9;
1615
import org.elasticsearch.jdk.RuntimeVersionFeature;
1716

1817
import java.io.IOException;
@@ -150,7 +149,6 @@ private static Stream<String> maybeWorkaroundG1Bug() {
150149
return Stream.of();
151150
}
152151

153-
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
154152
private static Stream<String> maybeAllowSecurityManager(boolean useEntitlements) {
155153
if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
156154
// Will become conditional on useEntitlements once entitlements can run without SM

libs/core/src/main/java/org/elasticsearch/jdk/RuntimeVersionFeature.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99

1010
package org.elasticsearch.jdk;
1111

12-
import org.elasticsearch.core.UpdateForV9;
13-
1412
public class RuntimeVersionFeature {
1513
private RuntimeVersionFeature() {}
1614

17-
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // Remove once we removed all references to SecurityManager in code
1815
public static boolean isSecurityManagerAvailable() {
1916
return Runtime.version().feature() < 24;
2017
}

0 commit comments

Comments
 (0)