Skip to content

Commit

Permalink
Update embedded JDKs to latest patch release
Browse files Browse the repository at this point in the history
Also switch back to Zulu where possible.

Closes #23913.

PiperOrigin-RevId: 684397892
Change-Id: I1b563bd45f85bd8ec5cfbaf8550f0a59ea8f0b54
  • Loading branch information
fmeum authored and copybara-github committed Oct 10, 2024
1 parent 788b608 commit 78b8871
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 23 deletions.
2 changes: 0 additions & 2 deletions bazel_downloader.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ rewrite (maven.google.com)/(.*) https://mirror.bazel.build/$1/$2
rewrite (maven.google.com)/(.*) https://$1/$2
rewrite (cdn.azul.com)/(.*) https://mirror.bazel.build/$1/$2
rewrite (cdn.azul.com)/(.*) https://$1/$2
rewrite (aka.ms)/(.*) https://mirror.bazel.build/$1/$2
rewrite (aka.ms)/(.*) https://$1/$2
37 changes: 16 additions & 21 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -74,54 +74,49 @@ def embedded_jdk_repositories():
"""OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK."""
http_file(
name = "openjdk_linux_vanilla",
sha256 = "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6",
integrity = "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ=",
downloaded_file_path = "zulu-linux-vanilla.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-linux_x64.tar.gz",
)
http_file(
name = "openjdk_linux_aarch64_vanilla",
sha256 = "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835",
integrity = "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw=",
downloaded_file_path = "zulu-linux-aarch64-vanilla.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-linux_aarch64.tar.gz",
)

http_file(
name = "openjdk_linux_s390x_vanilla",
sha256 = "0d5676c50821e0d0b951bf3ffd717e7a13be2a89d8848a5c13b4aedc6f982c78",
integrity = "sha256-yQDI1k+rHlMnSXT6Skxzalo3VEhaXFb0lHKBSAdzZYo=",
downloaded_file_path = "adoptopenjdk-s390x-vanilla.tar.gz",
url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.2_13.tar.gz",
url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.4_7.tar.gz",
)

# JDK21 unavailable so use JDK19 instead for linux ppc64le.
http_file(
name = "openjdk_linux_ppc64le_vanilla",
sha256 = "d08de863499d8851811c893e8915828f2cd8eb67ed9e29432a6b4e222d80a12f",
integrity = "sha256-wgjND7kFYGRKkPkoZn0vU7/kCMlXpeNiBlha2HRCd2E=",
downloaded_file_path = "adoptopenjdk-ppc64le-vanilla.tar.gz",
url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.2_13.tar.gz",
url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz",
)
http_file(
name = "openjdk_macos_x86_64_vanilla",
sha256 = "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd",
integrity = "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o=",
downloaded_file_path = "zulu-macos-vanilla.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-macosx_x64.tar.gz",
)
http_file(
name = "openjdk_macos_aarch64_vanilla",
sha256 = "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa",
integrity = "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8=",
downloaded_file_path = "zulu-macos-aarch64-vanilla.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-macosx_aarch64.tar.gz",
)
http_file(
name = "openjdk_win_vanilla",
sha256 = "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802",
integrity = "sha256-13Ha0Q0/C0QMNobR89K2izIIAqyXshLYdnGvPy7viEg=",
downloaded_file_path = "zulu-win-vanilla.zip",
url = "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-win_x64.zip",
)

# JDK21 unavailable from zulu, we'll use Microsoft's OpenJDK build instead.
http_file(
name = "openjdk_win_arm64_vanilla",
sha256 = "975603e684f2ec5a525b3b5336d6aa0b09b5b7d2d0d9e271bd6a9892ad550181",
integrity = "sha256-n4c+zPAwsdPch57B6w/14Rv3YALcgcXGRMNGK/bFFGs=",
downloaded_file_path = "zulu-win-arm64.zip",
url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-windows-aarch64.zip",
url = "https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jdk21.0.4-win_aarch64.zip",
)

0 comments on commit 78b8871

Please sign in to comment.