Update remote java_tools to javac11 version v10.1-rc1 Closes #12302. PiperOrigin-RevId: 337914197
diff --git a/WORKSPACE b/WORKSPACE index 844f73e..54b63d9 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -146,9 +146,9 @@ # Keep in sync with the archives fetched as part of building bazel. archives = [ "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "java_tools_javac11_linux-v10.0.zip", - "java_tools_javac11_windows-v10.0.zip", - "java_tools_javac11_darwin-v10.0.zip", + "java_tools_javac11_linux-v10.1.zip", + "java_tools_javac11_windows-v10.1.zip", + "java_tools_javac11_darwin-v10.1.zip", "coverage_output_generator-v2.5.zip", # bazelbuid/stardoc "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", @@ -187,9 +187,9 @@ dirname = "derived/distdir", sha256 = { "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "java_tools_javac11_linux-v10.0.zip": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "java_tools_javac11_windows-v10.0.zip": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "java_tools_javac11_darwin-v10.0.zip": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + "java_tools_javac11_linux-v10.1.zip": "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", + "java_tools_javac11_windows-v10.1.zip": "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", + "java_tools_javac11_darwin-v10.1.zip": "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", "coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", # bazelbuild/stardoc "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", @@ -230,14 +230,14 @@ "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", ], - "java_tools_javac11_linux-v10.0.zip": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "java_tools_javac11_linux-v10.1.zip": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip", ], - "java_tools_javac11_windows-v10.0.zip": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "java_tools_javac11_windows-v10.1.zip": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip", ], - "java_tools_javac11_darwin-v10.0.zip": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "java_tools_javac11_darwin-v10.1.zip": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip", ], "coverage_output_generator-v2.5.zip": [ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip", @@ -547,9 +547,9 @@ distdir_tar( name = "test_WORKSPACE_files", archives = [ - "java_tools_javac11_linux-v10.0.zip", - "java_tools_javac11_windows-v10.0.zip", - "java_tools_javac11_darwin-v10.0.zip", + "java_tools_javac11_linux-v10.1.zip", + "java_tools_javac11_windows-v10.1.zip", + "java_tools_javac11_darwin-v10.1.zip", "coverage_output_generator-v2.5.zip", "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", @@ -581,9 +581,9 @@ ], dirname = "test_WORKSPACE/distdir", sha256 = { - "java_tools_javac11_linux-v10.0.zip": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "java_tools_javac11_windows-v10.0.zip": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "java_tools_javac11_darwin-v10.0.zip": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + "java_tools_javac11_linux-v10.1.zip": "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", + "java_tools_javac11_windows-v10.1.zip": "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", + "java_tools_javac11_darwin-v10.1.zip": "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", "coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", @@ -614,9 +614,9 @@ "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", }, urls = { - "java_tools_javac11_linux-v10.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"], - "java_tools_javac11_windows-v10.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"], - "java_tools_javac11_darwin-v10.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"], + "java_tools_javac11_linux-v10.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip"], + "java_tools_javac11_windows-v10.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip"], + "java_tools_javac11_darwin-v10.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip"], "coverage_output_generator-v2.5.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"], "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"], "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"], @@ -921,10 +921,10 @@ name = "remote_java_tools_linux_for_testing", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + sha256 = "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_linux-v10.1.zip", ], ) @@ -933,10 +933,10 @@ name = "remote_java_tools_windows_for_testing", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + sha256 = "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_windows-v10.1.zip", ], ) @@ -945,10 +945,10 @@ name = "remote_java_tools_darwin_for_testing", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + sha256 = "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_darwin-v10.1.zip", ], ) @@ -957,9 +957,9 @@ name = "remote_java_tools_javac11_test_linux", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + sha256 = "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip", ], ) @@ -968,9 +968,9 @@ name = "remote_java_tools_javac11_test_windows", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + sha256 = "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip", ], ) @@ -979,9 +979,9 @@ name = "remote_java_tools_javac11_test_darwin", patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - sha256 = "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + sha256 = "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE index 51cd5e9..d881010 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
@@ -163,10 +163,10 @@ maybe( http_archive, name = "remote_java_tools_linux", - sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + sha256 = "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_linux-v10.1.zip", ], ) @@ -174,10 +174,10 @@ maybe( http_archive, name = "remote_java_tools_windows", - sha256 = "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + sha256 = "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_windows-v10.1.zip", ], ) @@ -185,10 +185,10 @@ maybe( http_archive, name = "remote_java_tools_darwin", - sha256 = "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + sha256 = "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.1/java_tools_javac11_darwin-v10.1.zip", ], )
diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives index 15f929c..e1bb5a1 100644 --- a/src/test/shell/bazel/testdata/jdk_http_archives +++ b/src/test/shell/bazel/testdata/jdk_http_archives
@@ -2,25 +2,25 @@ # This must be kept in sync with the top-level WORKSPACE file. http_archive( name = "remote_java_tools_javac11_test_linux", - sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + sha256 = "01e6912f7638c2ada1149fcf52979102c06982732a82044d925fc454d31998d8", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_linux-v10.1.zip", ], ) # This must be kept in sync with the top-level WORKSPACE file. http_archive( name = "remote_java_tools_javac11_test_windows", - sha256 = "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + sha256 = "48bda6ed98762de16cc25bb5d104fd1eacefc2b7c4470c72609a745c12b8870b", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_windows-v10.1.zip", ], ) # This must be kept in sync with the top-level WORKSPACE file. http_archive( name = "remote_java_tools_javac11_test_darwin", - sha256 = "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + sha256 = "6a258df035a756eb721855980d6dbdb11ef818d9d293740dd9327f9e2b018bcf", urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.1/java_tools_javac11_darwin-v10.1.zip", ], )