Skip to content

Commit f9157bb

Browse files
Bencodesbencodestx
andauthored
Stop enabling Java Security Manager before Java 24 (#1360)
* Stop enabling Java Security Manager before Java 24 * Fix --------- Co-authored-by: Ben Goodwyn <[email protected]>
1 parent 5ecb3fa commit f9157bb

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

kotlin/internal/jvm/impl.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ def _write_launcher_action(ctx, rjars, main_class, jvm_flags):
7272
java_bin_path = java_runtime.java_executable_runfiles_path
7373

7474
# Following https://github.com/bazelbuild/bazel/blob/6d5b084025a26f2f6d5041f7a9e8d302c590bc80/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl#L66-L67
75-
# Enable the security manager past deprecation.
75+
# Enable the security manager past deprecation until permanently disabled: https://openjdk.org/jeps/486
7676
# On bazel 6, this check isn't possible...
77-
if getattr(java_runtime, "version", 0) >= 17:
77+
_java_runtime_version = getattr(java_runtime, "version", 0)
78+
if _java_runtime_version >= 17 and _java_runtime_version < 24:
7879
jvm_flags = jvm_flags + " -Djava.security.manager=allow"
7980

8081
if ctx.configuration.coverage_enabled:

kotlin/internal/jvm/kt_android_local_test_impl.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
173173
# Append the security manager override
174174
jvm_flags = []
175175
java_runtime = ctx.toolchains[_JAVA_RUNTIME_TOOLCHAIN_TYPE].java_runtime
176-
if java_runtime.version >= 17:
176+
177+
_java_runtime_version = getattr(java_runtime, "version", 0)
178+
if _java_runtime_version >= 17 and _java_runtime_version < 24:
177179
jvm_flags.append("-Djava.security.manager=allow")
178180

179181
return _ProviderInfo(

src/main/starlark/core/compile/cli/compile.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ def write_jvm_launcher(toolchain_info, actions, path_separator, workspace_prefix
7070
java_bin_path = java_runtime.java_executable_runfiles_path
7171

7272
# Following https://github.com/bazelbuild/bazel/blob/6d5b084025a26f2f6d5041f7a9e8d302c590bc80/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl#L66-L67
73-
# Enable the security manager past deprecation.
73+
# Enable the security manager past deprecation until permanently disabled: https://openjdk.org/jeps/486
7474
# On bazel 6, this check isn't possible...
75-
if getattr(java_runtime, "version", 0) >= 17:
75+
_java_runtime_version = getattr(java_runtime, "version", 0)
76+
if _java_runtime_version >= 17 and _java_runtime_version < 24:
7677
jvm_flags = jvm_flags + " -Djava.security.manager=allow"
7778

7879
classpath = path_separator.join(

0 commit comments

Comments
 (0)