Skip to content

Commit ecf9b9a

Browse files
zhengwei143copybara-github
zhengwei143
authored and
copybara-github
committed
Upgrade embedded JDK to version 20.
Closes #18478. PiperOrigin-RevId: 542271805 Change-Id: I31edef3a01b071cb019adde91f9b9319f2808cd6
1 parent dfe11be commit ecf9b9a

File tree

3 files changed

+50
-45
lines changed

3 files changed

+50
-45
lines changed

‎distdir_deps.bzl‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -409,88 +409,90 @@ DIST_DEPS = {
409409
"package_version": "2.6",
410410
},
411411
"openjdk_linux_vanilla": {
412-
"archive": "zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
413-
"sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
414-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
412+
"archive": "zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
413+
"sha256": "ec5c0426a0eb2b0460968a044665ed4603b224acd5e20c379e9d7890511da683",
414+
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-linux_x64",
415415
"urls": [
416-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
417-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
416+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
417+
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
418418
],
419419
"used_in": [
420420
],
421421
},
422422
"openjdk_linux_aarch64_vanilla": {
423-
"archive": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
424-
"sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43",
425-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64",
423+
"archive": "zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
424+
"sha256": "2487cf315d1f56291c1f41fb56a34a7f863ce5bf85cadd284c79ea3f848d707c",
425+
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-linux_aarch64",
426426
"urls": [
427-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
428-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
427+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
428+
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
429429
],
430430
"used_in": [
431431
],
432432
},
433+
# JDK20 unavailable so use JDK19 instead for linux s390x.
433434
"openjdk_linux_s390x_vanilla": {
434-
"archive": "OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
435-
"sha256": "fdc82f4b06c880762503b0cb40e25f46cf8190d06011b3b768f4091d3334ef7f",
436-
"strip_prefix": "jdk-17.0.4.1+1",
435+
"archive": "OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
436+
"sha256": "f2512f9a8e9847dd5d3557c39b485a8e7a1ef37b601dcbcb748d22e49f44815c",
437+
"strip_prefix": "jdk-19.0.2+7",
437438
"urls": [
438-
"https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
439-
"https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
439+
"https://mirror.bazel.build/github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
440+
"https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
440441
],
441442
"used_in": [
442443
],
443444
},
444445
"openjdk_linux_ppc64le_vanilla": {
445-
"archive": "OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
446-
"sha256": "cbedd0a1428b3058d156e99e8e9bc8769e0d633736d6776a4c4d9136648f2fd1",
447-
"strip_prefix": "jdk-17.0.4.1+1",
446+
"archive": "OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
447+
"sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded",
448+
"strip_prefix": "jdk-20+36",
448449
"urls": [
449-
"https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
450-
"https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
450+
"https://mirror.bazel.build/github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
451+
"https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
451452
],
452453
"used_in": [],
453454
},
454455
"openjdk_macos_x86_64_vanilla": {
455-
"archive": "zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
456-
"sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
457-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
456+
"archive": "zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
457+
"sha256": "befee9db92345d5146945061b721d3a6c6e182471c1536f87dbadfd5aab0e241",
458+
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-macosx_x64",
458459
"urls": [
459-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
460-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
460+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
461+
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
461462
],
462463
"used_in": [
463464
],
464465
},
465466
"openjdk_macos_aarch64_vanilla": {
466-
"archive": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
467-
"sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
468-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
467+
"archive": "zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
468+
"sha256": "01e59f0160d051524bb16d865652d25d00a85390581737a8f35f89057c80892d",
469+
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-macosx_aarch64",
469470
"urls": [
470-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
471-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
471+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
472+
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
472473
],
473474
"used_in": [
474475
],
475476
},
476477
"openjdk_win_vanilla": {
477-
"archive": "zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
478-
"sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
479-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
478+
"archive": "zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
479+
"sha256": "8a97ee11da578292f7c9e772f3edd3f083fa4f34f47a98e3abefb625ab2225ba",
480+
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-win_x64",
480481
"urls": [
481-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
482-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
482+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
483+
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
483484
],
484485
"used_in": [
485486
],
486487
},
488+
# JDK20 unavailable so use JDK19 instead for win aarch64.
487489
"openjdk_win_arm64_vanilla": {
488-
"archive": "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
489-
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
490-
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
490+
"archive": "zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
491+
"sha256": "e73e851638066c48421a60e01ce7d956c1de0935620e1b66d8bbbd6cdd4f815e",
492+
"strip_prefix": "zulu19.28.81-ca-jdk19.0.0-win_aarch64",
491493
"urls": [
492-
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
493-
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
494+
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
495+
"https://cdn.azul.com/zulu/bin/zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
494496
],
495497
"used_in": [
496498
],

‎src/test/shell/bazel/bazel_test_test.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,11 @@ EOF
399399
cat <<EOF > BUILD
400400
sh_test(name = "test$i", srcs = [ "test$i.sh" ])
401401
EOF
402-
bazel test --spawn_strategy=standalone --jobs=1 \
403-
--runs_per_test=5 --runs_per_test_detects_flakes \
402+
bazel test --spawn_strategy=standalone \
403+
--jobs=1 \
404+
--experimental_use_semaphore_for_jobs \
405+
--runs_per_test=5 \
406+
--runs_per_test_detects_flakes \
404407
//:test$i &> $TEST_log || fail "should have succeeded"
405408
expect_log "FLAKY"
406409
done

‎src/test/shell/integration/minimal_jdk_test.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ export BAZEL_SUFFIX="_jdk_minimal"
4242
source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
4343
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }
4444

45-
# Bazel's install base is < 345MB with minimal JDK and > 342MB with an all
45+
# Bazel's install base is < 350MB with minimal JDK and > 350MB with an all
4646
# modules JDK.
47-
function test_size_less_than_345MB() {
47+
function test_size_less_than_350MB() {
4848
bazel info
4949
ib=$(bazel info install_base)
5050
size=$(du -s "$ib" | cut -d\ -f1)
51-
maxsize=$((1024*345))
51+
maxsize=$((1024*350))
5252
if [ $size -gt $maxsize ]; then
5353
echo "$ib was too big:" 1>&2
5454
du -a "$ib" 1>&2

0 commit comments

Comments
 (0)