Skip to content

Conditionally set -Djava.security.manager=allow for jdk >= 17 #1555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Conditionally set -Djava.security.manager=allow for jdk >= 17 #1555

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63a192d
Set default jdk version to 17 for the build
simuons Mar 19, 2024
e214f28
Add java version to buildkite rc
simuons Mar 19, 2024
f040181
Conditionally append -Djava.security.manager=allow
simuons Mar 19, 2024
373416c
Revert unrelated change
simuons Mar 19, 2024
4d38976
fix typo
simuons Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions scala/private/phases/phase_write_executable.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ load(
"java_bin",
"java_bin_windows",
"runfiles_root",
"specified_java_runtime",
)

def phase_write_executable_scalatest(ctx, p):
Expand All @@ -20,12 +21,15 @@ def phase_write_executable_scalatest(ctx, p):
ctx.attr.jvm_flags,
ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_test_jvm_flags,
)

expanded_jvm_flags = [
"-DRULES_SCALA_MAIN_WS_NAME=%s" % ctx.workspace_name,
"-DRULES_SCALA_ARGS_FILE=%s" % p.runfiles.args_file.short_path.replace("../", "external/"),
] + expand_location(ctx, final_jvm_flags)

args = struct(
rjars = p.coverage_runfiles.rjars,
jvm_flags = [
"-DRULES_SCALA_MAIN_WS_NAME=%s" % ctx.workspace_name,
"-DRULES_SCALA_ARGS_FILE=%s" % p.runfiles.args_file.short_path.replace("../", "external/"),
] + expand_location(ctx, final_jvm_flags),
jvm_flags = _allow_security_manager(ctx, expanded_jvm_flags),
use_jacoco = ctx.configuration.coverage_enabled,
)
return _phase_write_executable_default(ctx, p, args)
Expand All @@ -40,7 +44,7 @@ def phase_write_executable_repl(ctx, p):
def phase_write_executable_junit_test(ctx, p):
args = struct(
rjars = p.coverage_runfiles.rjars,
jvm_flags = p.jvm_flags + ctx.attr.jvm_flags,
jvm_flags = _allow_security_manager(ctx, p.jvm_flags + ctx.attr.jvm_flags),
main_class = "com.google.testing.junit.runner.BazelTestRunner",
use_jacoco = ctx.configuration.coverage_enabled,
)
Expand Down Expand Up @@ -182,3 +186,8 @@ def _jar_path_based_on_java_bin(ctx):
java_bin_var = java_bin(ctx)
jar_path = java_bin_var.rpartition("/")[0] + "/jar"
return jar_path

def _allow_security_manager(ctx, jvm_flags):
java_toolchain = ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"]
java_runtime = specified_java_runtime(ctx, java_toolchain.java.java_runtime if java_toolchain else None)
return jvm_flags + (["-Djava.security.manager=allow"] if java_runtime and java_runtime.version >= 17 else [])