RELNOTES: Upgrade the embedded JDK version to 11.0.2.
Fixes #6592.
Closes #7334.
PiperOrigin-RevId: 232215118
diff --git a/WORKSPACE b/WORKSPACE
index 1b8f768..3f2f93e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -122,9 +122,9 @@
http_file(
name = "openjdk_linux",
downloaded_file_path = "zulu-linux.tar.gz",
- sha256 = "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
+ sha256 = "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz",
],
)
@@ -140,9 +140,9 @@
http_file(
name = "openjdk_linux_minimal",
downloaded_file_path = "zulu-linux-minimal.tar.gz",
- sha256 = "944b9d7fdd4ccedb78c32ee8030b0745b67aa1e84e6ad55f259af8e29f609112",
+ sha256 = "241cab34b1dc91afe39cad4173331e45bfaf3267dfb3db306a50fa68a988ed3f",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-minimal-e72607133f91bceca8b67d6d5037aa6fbebef7b9-1547657682.tar.gz",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209948.tar.gz"
],
)
@@ -161,9 +161,9 @@
http_file(
name = "openjdk_macos",
downloaded_file_path = "zulu-macos.tar.gz",
- sha256 = "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de",
+ sha256 = "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz",
],
)
@@ -179,18 +179,18 @@
http_file(
name = "openjdk_macos_minimal",
downloaded_file_path = "zulu-macos-minimal.tar.gz",
- sha256 = "68e810c49412753a2d39121979f34c645112bbeff18d6c962a8f5f74203eade9",
+ sha256 = "652ed5d12b1a68b20ba717ddd1acc1b09837ca95110f96924f1202f133027b7e",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-minimal-e72607133f91bceca8b67d6d5037aa6fbebef7b9-1547657778.tar.gz",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209947.tar.gz",
],
)
http_file(
name = "openjdk_win",
downloaded_file_path = "zulu-win.zip",
- sha256 = "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed",
+ sha256 = "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip",
],
)
@@ -206,9 +206,9 @@
http_file(
name = "openjdk_win_minimal",
downloaded_file_path = "zulu-win-minimal.zip",
- sha256 = "a6e94b5ee98972cb39fb380f3bc8ba411a94f48619a57d673e1bc0f88f791b15",
+ sha256 = "00779c42fa1d1eee4e1eb7983327428087857ad5ee94f02581924eb47f368e50",
urls = [
- "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-minimal-e72607133f91bceca8b67d6d5037aa6fbebef7b9-1547657694.zip",
+ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip",
],
)
diff --git a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
index 0153219..0030b57 100755
--- a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
+++ b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
@@ -90,7 +90,7 @@
elif [[ $EMBEDDED_JDK == *.zip ]]; then
unzip -q $EMBEDDED_JDK
fi
- JAVABASE=$(echo zulu*)
+ JAVABASE=$(echo reduced*)
_log_progress "bootstrap"
env EXTRA_BAZEL_ARGS="--curses=no --strategy=Javac=standalone --host_javabase=@local_jdk//:jdk" ./compile.sh \
