Skip to content

Commit 66c22f4

Browse files
benjaminpcopybara-github
benjaminp
authored and
copybara-github
committed
Switch the embedded JDK to version 17.
This allows removing the "cached" allmodules and minimized jdk archives, since `jlink` is deterministic in newer JDK versions. Fixes bazelbuild#14785. Closes bazelbuild#16541. PiperOrigin-RevId: 489464974 Change-Id: If5bb457d20cf79b70ba03b862eff302ef4d296d2
1 parent 44918c5 commit 66c22f4

File tree

10 files changed

+88
-207
lines changed

10 files changed

+88
-207
lines changed

‎WORKSPACE

+1-71
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
workspace(name = "io_bazel")
22

3-
load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file", "http_jar")
3+
load("//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
44
load("//:distdir.bzl", "dist_http_archive", "dist_http_file", "distdir_tar")
55
load("//:distdir_deps.bzl", "DIST_DEPS")
66

@@ -145,44 +145,16 @@ distdir_tar(
145145
)
146146

147147
# OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK.
148-
http_file(
149-
name = "openjdk_linux",
150-
downloaded_file_path = "zulu-linux.tar.gz",
151-
sha256 = "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969",
152-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz"],
153-
)
154-
155148
dist_http_file(
156149
name = "openjdk_linux_vanilla",
157150
downloaded_file_path = "zulu-linux-vanilla.tar.gz",
158151
)
159152

160-
http_file(
161-
name = "openjdk_linux_minimal",
162-
downloaded_file_path = "zulu-linux-minimal.tar.gz",
163-
sha256 = "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae",
164-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"],
165-
)
166-
167-
http_file(
168-
name = "openjdk_linux_aarch64",
169-
downloaded_file_path = "zulu-linux-aarch64.tar.gz",
170-
sha256 = "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac",
171-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"],
172-
)
173-
174153
dist_http_file(
175154
name = "openjdk_linux_aarch64_vanilla",
176155
downloaded_file_path = "zulu-linux-aarch64-vanilla.tar.gz",
177156
)
178157

179-
http_file(
180-
name = "openjdk_linux_aarch64_minimal",
181-
downloaded_file_path = "zulu-linux-aarch64-minimal.tar.gz",
182-
sha256 = "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de",
183-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"],
184-
)
185-
186158
dist_http_file(
187159
name = "openjdk_linux_ppc64le_vanilla",
188160
downloaded_file_path = "adoptopenjdk-ppc64le-vanilla.tar.gz",
@@ -193,51 +165,16 @@ dist_http_file(
193165
downloaded_file_path = "adoptopenjdk-s390x-vanilla.tar.gz",
194166
)
195167

196-
http_file(
197-
name = "openjdk_macos_x86_64",
198-
downloaded_file_path = "zulu-macos.tar.gz",
199-
sha256 = "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
200-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"],
201-
)
202-
203168
dist_http_file(
204169
name = "openjdk_macos_x86_64_vanilla",
205170
downloaded_file_path = "zulu-macos-vanilla.tar.gz",
206171
)
207172

208-
http_file(
209-
name = "openjdk_macos_x86_64_minimal",
210-
downloaded_file_path = "zulu-macos-minimal.tar.gz",
211-
sha256 = "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
212-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"],
213-
)
214-
215-
http_file(
216-
name = "openjdk_macos_aarch64",
217-
downloaded_file_path = "zulu-macos-aarch64.tar.gz",
218-
sha256 = "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff",
219-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz"],
220-
)
221-
222173
dist_http_file(
223174
name = "openjdk_macos_aarch64_vanilla",
224175
downloaded_file_path = "zulu-macos-aarch64-vanilla.tar.gz",
225176
)
226177

227-
http_file(
228-
name = "openjdk_macos_aarch64_minimal",
229-
downloaded_file_path = "zulu-macos-aarch64-minimal.tar.gz",
230-
sha256 = "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b",
231-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz"],
232-
)
233-
234-
http_file(
235-
name = "openjdk_win",
236-
downloaded_file_path = "zulu-win.zip",
237-
sha256 = "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
238-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"],
239-
)
240-
241178
dist_http_file(
242179
name = "openjdk_win_vanilla",
243180
downloaded_file_path = "zulu-win-vanilla.zip",
@@ -248,13 +185,6 @@ dist_http_file(
248185
downloaded_file_path = "zulu-win-arm64.zip",
249186
)
250187

251-
http_file(
252-
name = "openjdk_win_minimal",
253-
downloaded_file_path = "zulu-win-minimal.zip",
254-
sha256 = "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae",
255-
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"],
256-
)
257-
258188
dist_http_archive(
259189
name = "bazelci_rules",
260190
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,

‎distdir_deps.bzl

+64-13
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ DIST_DEPS = {
395395
"aliases": [
396396
"remotejdk11_linux_for_testing",
397397
"openjdk11_linux_archive",
398-
"openjdk_linux_vanilla",
399398
],
400399
"archive": "zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
401400
"sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
@@ -409,7 +408,6 @@ DIST_DEPS = {
409408
"remotejdk11_linux_aarch64": {
410409
"aliases": [
411410
"remotejdk11_linux_aarch64_for_testing",
412-
"openjdk_linux_aarch64_vanilla",
413411
],
414412
"archive": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
415413
"sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",
@@ -423,7 +421,6 @@ DIST_DEPS = {
423421
"remotejdk11_linux_ppc64le": {
424422
"aliases": [
425423
"remotejdk11_linux_ppc64le_for_testing",
426-
"openjdk_linux_ppc64le_vanilla",
427424
],
428425
"sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
429426
"strip_prefix": "jdk-11.0.15+10",
@@ -436,7 +433,6 @@ DIST_DEPS = {
436433
"remotejdk11_linux_s390x": {
437434
"aliases": [
438435
"remotejdk11_linux_s390x_for_testing",
439-
"openjdk_linux_s390x_vanilla",
440436
],
441437
"sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
442438
"strip_prefix": "jdk-11.0.15+10",
@@ -449,7 +445,6 @@ DIST_DEPS = {
449445
"remotejdk11_macos": {
450446
"aliases": [
451447
"remotejdk11_macos_for_testing",
452-
"openjdk_macos_x86_64_vanilla",
453448
"openjdk11_darwin_archive",
454449
],
455450
"archive": "zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
@@ -463,7 +458,6 @@ DIST_DEPS = {
463458
},
464459
"remotejdk11_macos_aarch64": {
465460
"aliases": [
466-
"openjdk_macos_aarch64_vanilla",
467461
"remotejdk11_macos_aarch64_for_testing",
468462
"openjdk11_darwin_aarch64_archive",
469463
],
@@ -480,7 +474,6 @@ DIST_DEPS = {
480474
"aliases": [
481475
"remotejdk11_win_for_testing",
482476
"openjdk11_windows_archive",
483-
"openjdk_win_vanilla",
484477
],
485478
"archive": "zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
486479
"sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
@@ -504,7 +497,10 @@ DIST_DEPS = {
504497
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
505498
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
506499
],
507-
"used_in": ["test_WORKSPACE_files"],
500+
"used_in": [
501+
"additional_distfiles",
502+
"test_WORKSPACE_files",
503+
],
508504
},
509505
"remotejdk11_win_arm64": {
510506
"aliases": [
@@ -523,19 +519,25 @@ DIST_DEPS = {
523519
"aliases": [
524520
"remotejdk17_linux_for_testing",
525521
"openjdk17_linux_archive",
522+
"openjdk_linux_vanilla",
526523
],
524+
"archive": "zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",
527525
"sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de",
528526
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64",
529527
"urls": [
530528
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",
531529
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",
532530
],
533-
"used_in": [],
531+
"used_in": [
532+
"additional_distfiles",
533+
"test_WORKSPACE_files",
534+
],
534535
},
535536
"remotejdk17_linux_aarch64": {
536537
"aliases": [
537538
"remotejdk17_linux_aarch64_for_testing",
538539
"openjdk17_linux_aarch64_archive",
540+
"openjdk_linux_aarch64_vanilla",
539541
],
540542
"archive": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
541543
"sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06",
@@ -544,46 +546,95 @@ DIST_DEPS = {
544546
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
545547
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
546548
],
547-
"used_in": ["test_WORKSPACE_files"],
549+
"used_in": [
550+
"additional_distfiles",
551+
"test_WORKSPACE_files",
552+
],
553+
},
554+
"remotejdk17_linux_s390x": {
555+
"aliases": [
556+
"remotejdk17_linux_s390x_for_testing",
557+
"openjdk_linux_s390x_vanilla",
558+
],
559+
"archive": "OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
560+
"sha256": "fdc82f4b06c880762503b0cb40e25f46cf8190d06011b3b768f4091d3334ef7f",
561+
"strip_prefix": "jdk-17.0.4.1+1",
562+
"urls": [
563+
"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",
564+
"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",
565+
],
566+
"used_in": [
567+
"additional_distfiles",
568+
"test_WORKSPACE_files",
569+
],
570+
},
571+
"remotejdk17_linux_ppc64le": {
572+
"aliases": [
573+
"remotejdk17_linux_ppc64le_for_testing",
574+
"openjdk_linux_ppc64le_vanilla",
575+
],
576+
"archive": "OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
577+
"sha256": "cbedd0a1428b3058d156e99e8e9bc8769e0d633736d6776a4c4d9136648f2fd1",
578+
"strip_prefix": "jdk-17.0.4.1+1",
579+
"urls": [
580+
"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",
581+
"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",
582+
],
583+
"used_in": ["additional_distfiles"],
548584
},
549585
"remotejdk17_macos": {
550586
"aliases": [
551587
"remotejdk17_macos_for_testing",
552588
"openjdk17_darwin_archive",
589+
"openjdk_macos_x86_64_vanilla",
553590
],
591+
"archive": "zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",
554592
"sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80",
555593
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64",
556594
"urls": [
557595
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",
558596
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",
559597
],
560-
"used_in": [],
598+
"used_in": [
599+
"additional_distfiles",
600+
"test_WORKSPACE_files",
601+
],
561602
},
562603
"remotejdk17_macos_aarch64": {
563604
"aliases": [
564605
"remotejdk17_macos_aarch64_for_testing",
565606
"openjdk17_darwin_aarch64_archive",
607+
"openjdk_macos_aarch64_vanilla",
566608
],
609+
"archive": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",
567610
"sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977",
568611
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64",
569612
"urls": [
570613
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",
571614
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",
572615
],
573-
"used_in": [],
616+
"used_in": [
617+
"additional_distfiles",
618+
"test_WORKSPACE_files",
619+
],
574620
},
575621
"remotejdk17_win": {
576622
"aliases": [
577623
"remotejdk17_win_for_testing",
578624
"openjdk17_windows_archive",
625+
"openjdk_win_vanilla",
579626
],
627+
"archive": "zulu17.32.13-ca-jdk17.0.2-win_x64.zip",
580628
"sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb",
581629
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64",
582630
"urls": [
583631
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip",
584632
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip",
585633
],
586-
"used_in": [],
634+
"used_in": [
635+
"additional_distfiles",
636+
"test_WORKSPACE_files",
637+
],
587638
},
588639
"remotejdk18_linux_aarch64": {
589640
"aliases": [

0 commit comments

Comments
 (0)