Skip to content

Commit e586a5e

Browse files
fmeumcopybara-github
authored andcommitted
Update Bazel's embedded JDK to 23.0.1
In addition to performance improvements, this JDK release contains a fix for https://bugs.openjdk.org/browse/JDK-8330077, which allows `--watchfs` to handle a configurable number of changes to a watched path rather than maxing out at 500. Windows arm64 can switch to Zulu JDK 21. Since async-profiler is released very rarely (last release in January) and the latest release is not compatible with JDK 23, this PR consumes a recent nightly release instead. This has the side effect of removing a bit of bloat from the server jar as it no longer contains async profiler's native library for all OSes/arches. Closes bazelbuild#24609. PiperOrigin-RevId: 707717223 Change-Id: I29fe86eca1e0deeae813e7dbbf7d60859e3cba5e
1 parent 8ae2570 commit e586a5e

File tree

10 files changed

+563
-107
lines changed

10 files changed

+563
-107
lines changed

BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ pkg_tar(
111111
srcs = [
112112
"//third_party/googleapis:dist_jars",
113113
"//third_party/grpc-java:grpc_jars",
114+
"@async_profiler//file",
114115
"@com_google_protobuf//:protobuf_java",
115116
"@com_google_protobuf//:protobuf_java_util",
116117
"@com_google_protobuf//:protobuf_javalite",

MODULE.bazel

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ maven.install(
187187
"org.threeten:threeten-extra:1.5.0",
188188
"org.tukaani:xz:1.9",
189189
"org.yaml:snakeyaml:1.28",
190-
"tools.profiler:async-profiler:3.0",
191190
# The following jars are for testing.
192191
# junit is not test only due to //src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner,
193192
# and hamcrest is a dependency of junit.
@@ -364,6 +363,15 @@ http_file(
364363
urls = ["https://github.com/jqlang/jq/releases/download/jq-1.5/jq-win64.exe"],
365364
)
366365

366+
async_profiler_repos = use_extension("//:repositories.bzl", "async_profiler_repos")
367+
use_repo(
368+
async_profiler_repos,
369+
"async_profiler",
370+
"async_profiler_linux_arm64",
371+
"async_profiler_linux_x64",
372+
"async_profiler_macos",
373+
)
374+
367375
# =========================================
368376
# Other Bazel testing dependencies
369377
# =========================================

MODULE.bazel.lock

Lines changed: 205 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)