Skip to content

Commit 6202271

Browse files
comiuscopybara-github
comius
authored and
copybara-github
committed
Use the java_tools release split into platform independent and prebuilt part.
This builds on top of the commit "Separate java_tools into platform independent and prebuilt part.". - java_tools release 11.0 is used - java_tools platform independent repo is added - java toolchain definitions appropriate for new release are added to tools/jdk/BUILD - remote_java_tools are replaced with aliases - tests are reenabled Changelog: ``` $ git log --pretty=format:"%h %an %s" cd3480e...5a91c25 -- src/java_tools/ third_party/ijar/ tools/jdk/BUILD.java_tools d10013d Ivo List Separate java_tools into platform independent and prebuilt part. 3c9ad2d philwo Separate ijar sources from deployment zip. (#12556) 2d990cf philwo Fix #10127: Remove Python 2 dependency from tools/android. de2dab0 Ivo List Separate ijar sources from deployment zip. b17e9e4 Googler Automatic code cleanup. ``` Benchmark: ``` Bazel commit: /tmp/bazel-head, Project commit: c85ecbe, Project source: None metric mean median stddev pval wall: 185.647s 185.445s 2.224s cpu: 55.616s 54.410s 1.792s system: 18.043s 18.060s 0.330s memory: 94.000s 94.000s 0.000s Bazel commit: /tmp/comius-bazel, Project commit: c85ecbe, Project source: None metric mean median stddev pval wall: 184.544s ( -0.59%) 184.456s ( -0.53%) 1.626s 0.03730 cpu: 54.484s ( -2.03%) 54.990s ( +1.07%) 1.940s 0.42483 system: 17.364s ( -3.76%) 17.260s ( -4.43%) 0.392s 0.94697 memory: 94.000s ( +0.00%) 94.000s ( +0.00%) 0.000s 0.00000 ``` Closes #12552. Fixes #8406. PiperOrigin-RevId: 344530341
1 parent 9710449 commit 6202271

File tree

13 files changed

+339
-242
lines changed

13 files changed

+339
-242
lines changed

‎WORKSPACE

Lines changed: 70 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@ 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.4.zip",
150-
"java_tools_javac11_windows-v10.4.zip",
151-
"java_tools_javac11_darwin-v10.4.zip",
149+
"java_tools-v11.0.zip",
150+
"java_tools_linux-v11.0.zip",
151+
"java_tools_windows-v11.0.zip",
152+
"java_tools_darwin-v11.0.zip",
152153
"coverage_output_generator-v2.5.zip",
153154
# bazelbuid/stardoc
154155
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
@@ -187,9 +188,10 @@ distdir_tar(
187188
dirname = "derived/distdir",
188189
sha256 = {
189190
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
190-
"java_tools_javac11_linux-v10.4.zip": "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
191-
"java_tools_javac11_windows-v10.4.zip": "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
192-
"java_tools_javac11_darwin-v10.4.zip": "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
191+
"java_tools-v11.0.zip": "09ecd438f1a10aa36bf0a6a2f24ead884ef7e8e8a46d086f8af6db33556b76a8",
192+
"java_tools_linux-v11.0.zip": "b66d5b97b90cb20787cfa61565672b0538912d230f120a03f38020052f25c4bc",
193+
"java_tools_windows-v11.0.zip": "8a683275b0f24e011b56e27eb4d7e35919d774ae57ec3353d48606cfc81e4116",
194+
"java_tools_darwin-v11.0.zip": "39e3bb7e554e817de76a9b2cc9354b0c2363108dfcd56b360d3c35eadc8cddbd",
193195
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
194196
# bazelbuild/stardoc
195197
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
@@ -230,14 +232,17 @@ distdir_tar(
230232
"https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
231233
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
232234
],
233-
"java_tools_javac11_linux-v10.4.zip": [
234-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
235+
"java_tools-v11.0.zip": [
236+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools-v11.0.zip",
235237
],
236-
"java_tools_javac11_windows-v10.4.zip": [
237-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
238+
"java_tools_linux-v11.0.zip": [
239+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_linux-v11.0.zip",
238240
],
239-
"java_tools_javac11_darwin-v10.4.zip": [
240-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
241+
"java_tools_windows-v11.0.zip": [
242+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_windows-v11.0.zip",
243+
],
244+
"java_tools_darwin-v11.0.zip": [
245+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_darwin-v11.0.zip",
241246
],
242247
"coverage_output_generator-v2.5.zip": [
243248
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip",
@@ -545,9 +550,10 @@ http_archive(
545550
distdir_tar(
546551
name = "test_WORKSPACE_files",
547552
archives = [
548-
"java_tools_javac11_linux-v10.4.zip",
549-
"java_tools_javac11_windows-v10.4.zip",
550-
"java_tools_javac11_darwin-v10.4.zip",
553+
"java_tools-v11.0.zip",
554+
"java_tools_linux-v11.0.zip",
555+
"java_tools_windows-v11.0.zip",
556+
"java_tools_darwin-v11.0.zip",
551557
"coverage_output_generator-v2.5.zip",
552558
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
553559
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
@@ -579,9 +585,10 @@ distdir_tar(
579585
],
580586
dirname = "test_WORKSPACE/distdir",
581587
sha256 = {
582-
"java_tools_javac11_linux-v10.4.zip": "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
583-
"java_tools_javac11_windows-v10.4.zip": "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
584-
"java_tools_javac11_darwin-v10.4.zip": "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
588+
"java_tools-v11.0.zip": "09ecd438f1a10aa36bf0a6a2f24ead884ef7e8e8a46d086f8af6db33556b76a8",
589+
"java_tools_linux-v11.0.zip": "b66d5b97b90cb20787cfa61565672b0538912d230f120a03f38020052f25c4bc",
590+
"java_tools_windows-v11.0.zip": "8a683275b0f24e011b56e27eb4d7e35919d774ae57ec3353d48606cfc81e4116",
591+
"java_tools_darwin-v11.0.zip": "39e3bb7e554e817de76a9b2cc9354b0c2363108dfcd56b360d3c35eadc8cddbd",
585592
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
586593
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
587594
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
@@ -612,9 +619,10 @@ distdir_tar(
612619
"df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
613620
},
614621
urls = {
615-
"java_tools_javac11_linux-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip"],
616-
"java_tools_javac11_windows-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip"],
617-
"java_tools_javac11_darwin-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip"],
622+
"java_tools-v11.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools-v11.0.zip"],
623+
"java_tools_linux-v11.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_linux-v11.0.zip"],
624+
"java_tools_windows-v11.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_windows-v11.0.zip"],
625+
"java_tools_darwin-v11.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_darwin-v11.0.zip"],
618626
"coverage_output_generator-v2.5.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"],
619627
"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"],
620628
"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"],
@@ -914,15 +922,27 @@ http_archive(
914922
],
915923
)
916924

925+
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
926+
http_archive(
927+
name = "remote_java_tools_for_testing",
928+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
929+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
930+
sha256 = "09ecd438f1a10aa36bf0a6a2f24ead884ef7e8e8a46d086f8af6db33556b76a8",
931+
urls = [
932+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools-v11.0.zip",
933+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools-v11.0.zip",
934+
],
935+
)
936+
917937
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
918938
http_archive(
919939
name = "remote_java_tools_linux_for_testing",
920940
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
921941
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
922-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
942+
sha256 = "b66d5b97b90cb20787cfa61565672b0538912d230f120a03f38020052f25c4bc",
923943
urls = [
924-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
925-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_linux-v10.4.zip",
944+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_linux-v11.0.zip",
945+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_linux-v11.0.zip",
926946
],
927947
)
928948

@@ -931,10 +951,10 @@ http_archive(
931951
name = "remote_java_tools_windows_for_testing",
932952
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
933953
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
934-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
954+
sha256 = "8a683275b0f24e011b56e27eb4d7e35919d774ae57ec3353d48606cfc81e4116",
935955
urls = [
936-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
937-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_windows-v10.4.zip",
956+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_windows-v11.0.zip",
957+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_windows-v11.0.zip",
938958
],
939959
)
940960

@@ -943,43 +963,54 @@ http_archive(
943963
name = "remote_java_tools_darwin_for_testing",
944964
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
945965
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
946-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
966+
sha256 = "39e3bb7e554e817de76a9b2cc9354b0c2363108dfcd56b360d3c35eadc8cddbd",
967+
urls = [
968+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_darwin-v11.0.zip",
969+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_darwin-v11.0.zip",
970+
],
971+
)
972+
973+
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
974+
http_archive(
975+
name = "remote_java_tools_test",
976+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
977+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
978+
sha256 = "09ecd438f1a10aa36bf0a6a2f24ead884ef7e8e8a46d086f8af6db33556b76a8",
947979
urls = [
948-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
949-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_darwin-v10.4.zip",
980+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools-v11.0.zip",
950981
],
951982
)
952983

953984
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
954985
http_archive(
955-
name = "remote_java_tools_javac11_test_linux",
986+
name = "remote_java_tools_test_linux",
956987
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
957988
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
958-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
989+
sha256 = "b66d5b97b90cb20787cfa61565672b0538912d230f120a03f38020052f25c4bc",
959990
urls = [
960-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
991+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_linux-v11.0.zip",
961992
],
962993
)
963994

964995
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
965996
http_archive(
966-
name = "remote_java_tools_javac11_test_windows",
997+
name = "remote_java_tools_test_windows",
967998
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
968999
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
969-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
1000+
sha256 = "8a683275b0f24e011b56e27eb4d7e35919d774ae57ec3353d48606cfc81e4116",
9701001
urls = [
971-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
1002+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_windows-v11.0.zip",
9721003
],
9731004
)
9741005

9751006
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
9761007
http_archive(
977-
name = "remote_java_tools_javac11_test_darwin",
1008+
name = "remote_java_tools_test_darwin",
9781009
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
9791010
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
980-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
1011+
sha256 = "39e3bb7e554e817de76a9b2cc9354b0c2363108dfcd56b360d3c35eadc8cddbd",
9811012
urls = [
982-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
1013+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_darwin-v11.0.zip",
9831014
],
9841015
)
9851016

‎src/BUILD

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,12 @@ filegroup(
761761
"@openjdk_win_minimal//file",
762762
"@remote_coverage_tools_for_testing//:WORKSPACE",
763763
"@remote_java_tools_darwin_for_testing//:WORKSPACE",
764-
"@remote_java_tools_javac11_test_darwin//:WORKSPACE",
765-
"@remote_java_tools_javac11_test_linux//:WORKSPACE",
766-
"@remote_java_tools_javac11_test_windows//:WORKSPACE",
764+
"@remote_java_tools_for_testing//:WORKSPACE",
767765
"@remote_java_tools_linux_for_testing//:WORKSPACE",
766+
"@remote_java_tools_test//:WORKSPACE",
767+
"@remote_java_tools_test_darwin//:WORKSPACE",
768+
"@remote_java_tools_test_linux//:WORKSPACE",
769+
"@remote_java_tools_test_windows//:WORKSPACE",
768770
"@remote_java_tools_windows_for_testing//:WORKSPACE",
769771
"@remotejdk11_linux_aarch64_for_testing//:WORKSPACE",
770772
"@remotejdk11_linux_for_testing//:WORKSPACE",

‎src/create_java_tools_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ for platform in "linux" "windows" "darwin"; do
8989
# Download the file locally to compute its sha256sum (needed to update the
9090
# java_tools in Bazel).
9191
# Don't overwrite existing file.
92-
local_zip="$tmp_dir/java_tools_$platform.zip"
92+
local_zip="$tmp_dir/java_tools$platform.zip"
9393
gsutil -q cp -n ${gcs_bucket}/${rc_url} ${local_zip}
9494
file_hash=$(sha256sum ${local_zip} | cut -d' ' -f1)
9595
echo "${release_artifact} ${file_hash}"

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,36 +159,47 @@ maybe(
159159
],
160160
)
161161

162+
# This must be kept in sync with the top-level WORKSPACE file.
163+
maybe(
164+
http_archive,
165+
name = "remote_java_tools",
166+
sha256 = "09ecd438f1a10aa36bf0a6a2f24ead884ef7e8e8a46d086f8af6db33556b76a8",
167+
urls = [
168+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools-v11.0.zip",
169+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools-v11.0.zip",
170+
],
171+
)
172+
162173
# This must be kept in sync with the top-level WORKSPACE file.
163174
maybe(
164175
http_archive,
165176
name = "remote_java_tools_linux",
166-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
177+
sha256 = "b66d5b97b90cb20787cfa61565672b0538912d230f120a03f38020052f25c4bc",
167178
urls = [
168-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
169-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_linux-v10.4.zip",
179+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_linux-v11.0.zip",
180+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_linux-v11.0.zip",
170181
],
171182
)
172183

173184
# This must be kept in sync with the top-level WORKSPACE file.
174185
maybe(
175186
http_archive,
176187
name = "remote_java_tools_windows",
177-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
188+
sha256 = "8a683275b0f24e011b56e27eb4d7e35919d774ae57ec3353d48606cfc81e4116",
178189
urls = [
179-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
180-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_windows-v10.4.zip",
190+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_windows-v11.0.zip",
191+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_windows-v11.0.zip",
181192
],
182193
)
183194

184195
# This must be kept in sync with the top-level WORKSPACE file.
185196
maybe(
186197
http_archive,
187198
name = "remote_java_tools_darwin",
188-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
199+
sha256 = "39e3bb7e554e817de76a9b2cc9354b0c2363108dfcd56b360d3c35eadc8cddbd",
189200
urls = [
190-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
191-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_darwin-v10.4.zip",
201+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.0/java_tools_darwin-v11.0.zip",
202+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.0/java_tools_darwin-v11.0.zip",
192203
],
193204
)
194205

‎src/test/py/bazel/test_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class TestBase(unittest.TestCase):
6969
'remotejdk15_linux_for_testing',
7070
'remotejdk15_macos_for_testing',
7171
'remotejdk15_win_for_testing',
72+
'remote_java_tools_for_testing',
7273
'remote_java_tools_darwin_for_testing',
7374
'remote_java_tools_linux_for_testing',
7475
'remote_java_tools_windows_for_testing',

‎src/test/shell/bazel/BUILD

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,7 @@ sh_test(
200200
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
201201
"@bazel_tools//tools/bash/runfiles",
202202
],
203-
# TODO(ilist): reenable after java_tools release
204-
tags = [
205-
"local",
206-
"manual",
207-
],
203+
tags = ["local"],
208204
)
209205

210206
sh_test(
@@ -229,11 +225,7 @@ sh_test(
229225
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
230226
"@bazel_tools//tools/bash/runfiles",
231227
],
232-
# TODO(ilist): reenable after java_tools release
233-
tags = [
234-
"local",
235-
"manual",
236-
],
228+
tags = ["local"],
237229
)
238230

239231
sh_test(
@@ -283,8 +275,6 @@ JAVA_VERSIONS = ("11", "14", "15")
283275
"@bazel_tools//tools/bash/runfiles",
284276
],
285277
exec_compatible_with = ["//:highcpu_machine"],
286-
# TODO(ilist): reenable after java_tools release
287-
tags = ["manual"],
288278
)
289279
for java_version in JAVA_VERSIONS
290280
]
@@ -315,8 +305,6 @@ JAVA_VERSIONS = ("11", "14", "15")
315305
"@bazel_tools//tools/bash/runfiles",
316306
],
317307
exec_compatible_with = ["//:highcpu_machine"],
318-
# TODO(ilist): reenable after java_tools release
319-
tags = ["manual"],
320308
)
321309
for java_version in JAVA_VERSIONS
322310
]
@@ -378,7 +366,6 @@ sh_test(
378366
name = "bazel_java_tools_dist_test",
379367
size = "small",
380368
srcs = ["bazel_java_tools_dist_test.sh"],
381-
args = ["javac11"],
382369
data = [
383370
":test-deps",
384371
"//src:java_tools_dist.zip",
@@ -587,10 +574,7 @@ sh_test(
587574
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
588575
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:coverage_output_generator_repo",
589576
],
590-
tags = [
591-
"manual", # TODO(ilist): reenable after java_tools release
592-
"no_windows",
593-
],
577+
tags = ["no_windows"],
594578
)
595579
for java_version in JAVA_VERSIONS
596580
]

‎src/test/shell/bazel/bazel_java_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ if [[ "${JAVA_TOOLS_PREBUILT_ZIP}" != "released" ]]; then
7676
if [[ "${JAVA_TOOLS_PREBUILT_ZIP}" == file* ]]; then
7777
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="${JAVA_TOOLS_PREBUILT_ZIP}"
7878
elif "$is_windows"; then
79-
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file:///$(rlocation io_bazel/JAVA_TOOLS_PREBUILT_ZIP)"
79+
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file:///$(rlocation io_bazel/$JAVA_TOOLS_PREBUILT_ZIP)"
8080
else
81-
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file://$(rlocation io_bazel/JAVA_TOOLS_PREBUILT_ZIP)"
81+
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file://$(rlocation io_bazel/$JAVA_TOOLS_PREBUILT_ZIP)"
8282
fi
8383
fi
8484
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL=${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL:-}

0 commit comments

Comments
 (0)