Skip to content

Commit 3457f2a

Browse files
comiusphilwo
comius
authored and
philwo
committed
Update to java_tools javac11 10.6 (#13245)
* Update to java_tools javac11 10.6 rc1 * Update to java_tools javac11 10.6
1 parent b96bafa commit 3457f2a

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎WORKSPACE

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ distdir_tar(
146146
# Keep in sync with the archives fetched as part of building bazel.
147147
archives = [
148148
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
149-
"java_tools_javac11_linux-v10.5.zip",
150-
"java_tools_javac11_windows-v10.5.zip",
151-
"java_tools_javac11_darwin-v10.5.zip",
149+
"java_tools_javac11_linux-v10.6.zip",
150+
"java_tools_javac11_windows-v10.6.zip",
151+
"java_tools_javac11_darwin-v10.6.zip",
152152
"coverage_output_generator-v2.5.zip",
153153
# bazelbuid/stardoc
154154
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
@@ -187,9 +187,9 @@ distdir_tar(
187187
dirname = "derived/distdir",
188188
sha256 = {
189189
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
190-
"java_tools_javac11_linux-v10.5.zip": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
191-
"java_tools_javac11_windows-v10.5.zip": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
192-
"java_tools_javac11_darwin-v10.5.zip": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
190+
"java_tools_javac11_linux-v10.6.zip": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
191+
"java_tools_javac11_windows-v10.6.zip": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
192+
"java_tools_javac11_darwin-v10.6.zip": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
193193
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
194194
# bazelbuild/stardoc
195195
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
@@ -230,14 +230,14 @@ distdir_tar(
230230
"https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
231231
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
232232
],
233-
"java_tools_javac11_linux-v10.5.zip": [
234-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
233+
"java_tools_javac11_linux-v10.6.zip": [
234+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
235235
],
236-
"java_tools_javac11_windows-v10.5.zip": [
237-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
236+
"java_tools_javac11_windows-v10.6.zip": [
237+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
238238
],
239-
"java_tools_javac11_darwin-v10.5.zip": [
240-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
239+
"java_tools_javac11_darwin-v10.6.zip": [
240+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
241241
],
242242
"coverage_output_generator-v2.5.zip": [
243243
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip",
@@ -545,9 +545,9 @@ http_archive(
545545
distdir_tar(
546546
name = "test_WORKSPACE_files",
547547
archives = [
548-
"java_tools_javac11_linux-v10.5.zip",
549-
"java_tools_javac11_windows-v10.5.zip",
550-
"java_tools_javac11_darwin-v10.5.zip",
548+
"java_tools_javac11_linux-v10.6.zip",
549+
"java_tools_javac11_windows-v10.6.zip",
550+
"java_tools_javac11_darwin-v10.6.zip",
551551
"coverage_output_generator-v2.5.zip",
552552
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
553553
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
@@ -579,9 +579,9 @@ distdir_tar(
579579
],
580580
dirname = "test_WORKSPACE/distdir",
581581
sha256 = {
582-
"java_tools_javac11_linux-v10.5.zip": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
583-
"java_tools_javac11_windows-v10.5.zip": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
584-
"java_tools_javac11_darwin-v10.5.zip": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
582+
"java_tools_javac11_linux-v10.6.zip": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
583+
"java_tools_javac11_windows-v10.6.zip": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
584+
"java_tools_javac11_darwin-v10.6.zip": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
585585
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
586586
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
587587
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
@@ -612,9 +612,9 @@ distdir_tar(
612612
"df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
613613
},
614614
urls = {
615-
"java_tools_javac11_linux-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip"],
616-
"java_tools_javac11_windows-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip"],
617-
"java_tools_javac11_darwin-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip"],
615+
"java_tools_javac11_linux-v10.6.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip"],
616+
"java_tools_javac11_windows-v10.6.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip"],
617+
"java_tools_javac11_darwin-v10.6.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip"],
618618
"coverage_output_generator-v2.5.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"],
619619
"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"],
620620
"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"],
@@ -918,10 +918,10 @@ http_archive(
918918
name = "remote_java_tools_linux_for_testing",
919919
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
920920
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
921-
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
921+
sha256 = "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
922922
urls = [
923-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
924-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip",
923+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
924+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip",
925925
],
926926
)
927927

@@ -930,10 +930,10 @@ http_archive(
930930
name = "remote_java_tools_windows_for_testing",
931931
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
932932
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
933-
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
933+
sha256 = "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
934934
urls = [
935-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
936-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip",
935+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
936+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip",
937937
],
938938
)
939939

@@ -942,10 +942,10 @@ http_archive(
942942
name = "remote_java_tools_darwin_for_testing",
943943
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
944944
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
945-
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
945+
sha256 = "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
946946
urls = [
947-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
948-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip",
947+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
948+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip",
949949
],
950950
)
951951

@@ -954,9 +954,9 @@ http_archive(
954954
name = "remote_java_tools_javac11_test_linux",
955955
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
956956
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
957-
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
957+
sha256 = "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
958958
urls = [
959-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
959+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
960960
],
961961
)
962962

@@ -965,9 +965,9 @@ http_archive(
965965
name = "remote_java_tools_javac11_test_windows",
966966
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
967967
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
968-
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
968+
sha256 = "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
969969
urls = [
970-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
970+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
971971
],
972972
)
973973

@@ -976,9 +976,9 @@ http_archive(
976976
name = "remote_java_tools_javac11_test_darwin",
977977
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
978978
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
979-
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
979+
sha256 = "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
980980
urls = [
981-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
981+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
982982
],
983983
)
984984

‎src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,32 +163,32 @@ maybe(
163163
maybe(
164164
http_archive,
165165
name = "remote_java_tools_linux",
166-
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
166+
sha256 = "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
167167
urls = [
168-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
169-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip",
168+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
169+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip",
170170
],
171171
)
172172

173173
# This must be kept in sync with the top-level WORKSPACE file.
174174
maybe(
175175
http_archive,
176176
name = "remote_java_tools_windows",
177-
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
177+
sha256 = "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
178178
urls = [
179-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
180-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip",
179+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
180+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip",
181181
],
182182
)
183183

184184
# This must be kept in sync with the top-level WORKSPACE file.
185185
maybe(
186186
http_archive,
187187
name = "remote_java_tools_darwin",
188-
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
188+
sha256 = "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
189189
urls = [
190-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
191-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip",
190+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
191+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip",
192192
],
193193
)
194194

‎src/test/shell/bazel/testdata/jdk_http_archives

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
# This must be kept in sync with the top-level WORKSPACE file.
33
http_archive(
44
name = "remote_java_tools_javac11_test_linux",
5-
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
5+
sha256 = "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
66
urls = [
7-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
7+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
88
],
99
)
1010
# This must be kept in sync with the top-level WORKSPACE file.
1111
http_archive(
1212
name = "remote_java_tools_javac11_test_windows",
13-
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
13+
sha256 = "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
1414
urls = [
15-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
15+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
1616
],
1717
)
1818
# This must be kept in sync with the top-level WORKSPACE file.
1919
http_archive(
2020
name = "remote_java_tools_javac11_test_darwin",
21-
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
21+
sha256 = "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
2222
urls = [
23-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
23+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
2424
],
2525
)
2626

0 commit comments

Comments
 (0)