Skip to content

Commit e4682f6

Browse files
keertkhvadehra
keertk
and
hvadehra
authored
[6.2.0] Update java_tools v12.1 (bazelbuild#18197)
* Separate prebuilt darwin java_tools for x86_64 and arm64 This is step 1 of bazelbuild#17780 Closes bazelbuild#17767. PiperOrigin-RevId: 517115807 Change-Id: If2bb85a8a15fd126ab52e5738e3d9558da813090 * Update rules_java and remove references to "remote_java_tools_darwin" This is the last step of bazelbuild#17780 This updates rules_java to v5.5.0 for bazel and bazel_tools and cleans up any remaining references to remote_java_tools_darwin, remote_java_tools_test_darwin, and remote_java_tools_darwin_for_testing Closes bazelbuild#17843. PiperOrigin-RevId: 519059189 Change-Id: Ic04f3a2e5cc12e6b7731f6d8a3551553e172e000 * Update java_tools v12.1 bazelbuild/java_tools#69 Closes bazelbuild#18097. PiperOrigin-RevId: 526116409 Change-Id: I4f31046d7e5b149c5035b0ede0699d74685a1eb8 --------- Co-authored-by: hvd <[email protected]>
1 parent bb37d0b commit e4682f6

File tree

15 files changed

+113
-47
lines changed

15 files changed

+113
-47
lines changed

‎MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bazel_dep(name = "zlib", version = "1.2.13")
2020

2121
# The following are required when building without WORKSPACE SUFFIX
2222
bazel_dep(name = "rules_cc", version = "0.0.2")
23-
bazel_dep(name = "rules_java", version = "5.1.0")
23+
bazel_dep(name = "rules_java", version = "5.5.0")
2424
bazel_dep(name = "rules_proto", version = "4.0.0")
2525

2626
# TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR.

‎WORKSPACE

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,14 @@ dist_http_archive(
517517

518518
# Used in src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
519519
dist_http_archive(
520-
name = "remote_java_tools_darwin_for_testing",
520+
name = "remote_java_tools_darwin_x86_64_for_testing",
521+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
522+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
523+
)
524+
525+
# Used in src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
526+
dist_http_archive(
527+
name = "remote_java_tools_darwin_arm64_for_testing",
521528
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
522529
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
523530
)
@@ -545,7 +552,14 @@ dist_http_archive(
545552

546553
# Used in src/test/shell/bazel/testdata/jdk_http_archives.
547554
dist_http_archive(
548-
name = "remote_java_tools_test_darwin",
555+
name = "remote_java_tools_test_darwin_x86_64",
556+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
557+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
558+
)
559+
560+
# Used in src/test/shell/bazel/testdata/jdk_http_archives.
561+
dist_http_archive(
562+
name = "remote_java_tools_test_darwin_arm64",
549563
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
550564
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
551565
)

‎distdir_deps.bzl

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -371,64 +371,80 @@ DIST_DEPS = {
371371
"remote_java_tools_test",
372372
"remote_java_tools_for_testing",
373373
],
374-
"archive": "java_tools-v11.12.zip",
375-
"sha256": "af20366f926b1dadf8c084a51936116ef2f0db90e73e94b406c4ad8180f0788d",
374+
"archive": "java_tools-v12.1.zip",
375+
"sha256": "0db35ec44745fd15b77d9df954e70a4fcf74554dd5bfe3f6e6cb6bbdc1f1c649",
376376
"urls": [
377-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools-v11.12.zip",
378-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools-v11.12.zip",
377+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools-v12.1.zip",
378+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools-v12.1.zip",
379379
],
380380
"used_in": [
381381
"test_WORKSPACE_files",
382382
],
383-
"package_version": "11.12",
383+
"package_version": "12.1",
384384
},
385385
"remote_java_tools_linux": {
386386
"aliases": [
387387
"remote_java_tools_test_linux",
388388
"remote_java_tools_linux_for_testing",
389389
],
390-
"archive": "java_tools_linux-v11.12.zip",
391-
"sha256": "37f79597f5b8c1501b9c66ded8ac68c61205ad39ef3ceda0e24fbd0afa3cd97f",
390+
"archive": "java_tools_linux-v12.1.zip",
391+
"sha256": "093ecac3b42fcbc3621d08edc3ae3c8b0bc2bf56a0d9a85ddcdb1e0bcf10cbc7",
392392
"urls": [
393-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_linux-v11.12.zip",
394-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_linux-v11.12.zip",
393+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_linux-v12.1.zip",
394+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_linux-v12.1.zip",
395395
],
396396
"used_in": [
397397
"test_WORKSPACE_files",
398398
],
399-
"package_version": "11.12",
399+
"package_version": "12.1",
400400
},
401401
"remote_java_tools_windows": {
402402
"aliases": [
403403
"remote_java_tools_test_windows",
404404
"remote_java_tools_windows_for_testing",
405405
],
406-
"archive": "java_tools_windows-v11.12.zip",
407-
"sha256": "43432ce4814513d6497661b4fede691982b3bdef7a1907808b096291f56a8001",
406+
"archive": "java_tools_windows-v12.1.zip",
407+
"sha256": "1df7cc7fac54f437f43c24c019462e13058f394fdba5a64f566b92e8af18d0cf",
408408
"urls": [
409-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_windows-v11.12.zip",
410-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_windows-v11.12.zip",
409+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_windows-v12.1.zip",
410+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_windows-v12.1.zip",
411411
],
412412
"used_in": [
413413
"test_WORKSPACE_files",
414414
],
415-
"package_version": "11.12",
415+
"package_version": "12.1",
416416
},
417-
"remote_java_tools_darwin": {
417+
"remote_java_tools_darwin_x86_64": {
418418
"aliases": [
419-
"remote_java_tools_test_darwin",
420-
"remote_java_tools_darwin_for_testing",
419+
"remote_java_tools_test_darwin_x86_64",
420+
"remote_java_tools_darwin_x86_64_for_testing",
421421
],
422-
"archive": "java_tools_darwin-v11.12.zip",
423-
"sha256": "aed319892b638efabd08405b8f835770e13e2465d20459876c5f457f2b6426f3",
422+
"archive": "java_tools_darwin_x86_64-v12.1.zip",
423+
"sha256": "16ca145203a62a1fcd6ae50513c0935d938591cb309b9b1172e257c57873f60d",
424424
"urls": [
425-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_darwin-v11.12.zip",
426-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_darwin-v11.12.zip",
425+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_x86_64-v12.1.zip",
426+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_x86_64-v12.1.zip",
427427
],
428428
"used_in": [
429429
"test_WORKSPACE_files",
430430
],
431-
"package_version": "11.12",
431+
"package_version": "12.1",
432+
},
433+
"remote_java_tools_darwin_arm64": {
434+
"aliases": [
435+
"remote_java_tools_test_darwin_arm64",
436+
"remote_java_tools_darwin_arm64_for_testing",
437+
],
438+
"archive": "java_tools_darwin_arm64-v12.1.zip",
439+
"sha256": "1d8e575e558782c2ceec0940e424f0e2df56b0df3d7fae68333eaceef2c4e41c",
440+
"urls": [
441+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_arm64-v12.1.zip",
442+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_arm64-v12.1.zip",
443+
],
444+
"used_in": [
445+
"test_WORKSPACE_files",
446+
],
447+
"package_version": "12.1",
432448
},
433449
"remotejdk11_linux": {
434450
"aliases": [

‎src/BUILD

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,11 +660,13 @@ filegroup(
660660
"@openjdk_macos_x86_64_minimal//file",
661661
"@openjdk_win_minimal//file",
662662
"@remote_coverage_tools//:WORKSPACE",
663-
"@remote_java_tools_darwin_for_testing//:WORKSPACE",
663+
"@remote_java_tools_darwin_x86_64_for_testing//:WORKSPACE",
664+
"@remote_java_tools_darwin_arm64_for_testing//:WORKSPACE",
664665
"@remote_java_tools_for_testing//:WORKSPACE",
665666
"@remote_java_tools_linux_for_testing//:WORKSPACE",
666667
"@remote_java_tools_test//:WORKSPACE",
667-
"@remote_java_tools_test_darwin//:WORKSPACE",
668+
"@remote_java_tools_test_darwin_x86_64//:WORKSPACE",
669+
"@remote_java_tools_test_darwin_arm64//:WORKSPACE",
668670
"@remote_java_tools_test_linux//:WORKSPACE",
669671
"@remote_java_tools_test_windows//:WORKSPACE",
670672
"@remote_java_tools_windows_for_testing//:WORKSPACE",

‎src/MODULE.tools

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module(name = "bazel_tools")
22

33
bazel_dep(name = "rules_cc", version = "0.0.2")
4-
bazel_dep(name = "rules_java", version = "5.3.5")
4+
bazel_dep(name = "rules_java", version = "5.5.0")
55
bazel_dep(name = "rules_license", version = "0.0.3")
66
bazel_dep(name = "rules_proto", version = "4.0.0")
77
bazel_dep(name = "rules_python", version = "0.4.0")
@@ -24,7 +24,8 @@ use_repo(
2424
"remote_java_tools",
2525
"remote_java_tools_linux",
2626
"remote_java_tools_windows",
27-
"remote_java_tools_darwin",
27+
"remote_java_tools_darwin_x86_64",
28+
"remote_java_tools_darwin_arm64",
2829
)
2930

3031
sh_configure_extension = use_extension("//tools/sh:sh_configure.bzl", "sh_configure_extension")

‎src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ gen_workspace_stanza(
9090
"remote_java_tools",
9191
"remote_java_tools_linux",
9292
"remote_java_tools_windows",
93-
"remote_java_tools_darwin",
93+
"remote_java_tools_darwin_x86_64",
94+
"remote_java_tools_darwin_arm64",
9495
"rules_cc",
9596
"rules_java",
9697
"rules_proto",

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,12 @@ maybe(
254254

255255
maybe(
256256
http_archive,
257-
{remote_java_tools_darwin}
257+
{remote_java_tools_darwin_x86_64}
258+
)
259+
260+
maybe(
261+
http_archive,
262+
{remote_java_tools_darwin_arm64}
258263
)
259264

260265
maybe(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ class TestBase(unittest.TestCase):
7777
'remotejdk18_win_for_testing',
7878
'remotejdk18_win_arm64_for_testing',
7979
'remote_java_tools_for_testing',
80-
'remote_java_tools_darwin_for_testing',
80+
'remote_java_tools_darwin_x86_64_for_testing',
81+
'remote_java_tools_darwin_arm64_for_testing',
8182
'remote_java_tools_linux_for_testing',
8283
'remote_java_tools_windows_for_testing',
8384
'remote_coverage_tools',

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ if [[ "${JAVA_TOOLS_PREBUILT_ZIP}" != "released" ]]; then
4343
inplace-sed "/override_repository=remote_java_tools=/d" "$TEST_TMPDIR/bazelrc"
4444
inplace-sed "/override_repository=remote_java_tools_linux=/d" "$TEST_TMPDIR/bazelrc"
4545
inplace-sed "/override_repository=remote_java_tools_windows=/d" "$TEST_TMPDIR/bazelrc"
46-
inplace-sed "/override_repository=remote_java_tools_darwin=/d" "$TEST_TMPDIR/bazelrc"
46+
inplace-sed "/override_repository=remote_java_tools_darwin_x86_64=/d" "$TEST_TMPDIR/bazelrc"
47+
inplace-sed "/override_repository=remote_java_tools_darwin_arm64=/d" "$TEST_TMPDIR/bazelrc"
4748
fi
4849
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL=${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL:-}
4950

@@ -80,7 +81,11 @@ http_archive(
8081
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
8182
)
8283
http_archive(
83-
name = "remote_java_tools_darwin",
84+
name = "remote_java_tools_darwin_x86_64",
85+
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
86+
)
87+
http_archive(
88+
name = "remote_java_tools_darwin_arm64",
8489
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
8590
)
8691
EOF

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ http_archive(
9191
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
9292
)
9393
http_archive(
94-
name = "remote_java_tools_darwin",
94+
name = "remote_java_tools_darwin_x86_64",
95+
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
96+
)
97+
http_archive(
98+
name = "remote_java_tools_darwin_arm64",
9599
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
96100
)
97101
EOF

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ if [[ "${JAVA_TOOLS_PREBUILT_ZIP}" != "released" ]]; then
8282
inplace-sed "/override_repository=remote_java_tools=/d" "$TEST_TMPDIR/bazelrc"
8383
inplace-sed "/override_repository=remote_java_tools_linux=/d" "$TEST_TMPDIR/bazelrc"
8484
inplace-sed "/override_repository=remote_java_tools_windows=/d" "$TEST_TMPDIR/bazelrc"
85-
inplace-sed "/override_repository=remote_java_tools_darwin=/d" "$TEST_TMPDIR/bazelrc"
85+
inplace-sed "/override_repository=remote_java_tools_darwin_x86_64=/d" "$TEST_TMPDIR/bazelrc"
86+
inplace-sed "/override_repository=remote_java_tools_darwin_arm64=/d" "$TEST_TMPDIR/bazelrc"
8687
fi
8788
JAVA_TOOLS_PREBUILT_ZIP_FILE_URL=${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL:-}
8889

@@ -129,7 +130,11 @@ http_archive(
129130
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
130131
)
131132
http_archive(
132-
name = "remote_java_tools_darwin",
133+
name = "remote_java_tools_darwin_x86_64",
134+
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
135+
)
136+
http_archive(
137+
name = "remote_java_tools_darwin_arm64",
133138
urls = ["${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL}"]
134139
)
135140
EOF

‎src/test/shell/bazel/testdata/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ gen_workspace_stanza(
4949
"remote_java_tools_test",
5050
"remote_java_tools_test_linux",
5151
"remote_java_tools_test_windows",
52-
"remote_java_tools_test_darwin",
52+
"remote_java_tools_test_darwin_x86_64",
53+
"remote_java_tools_test_darwin_arm64",
5354
"openjdk11_linux_archive",
5455
"openjdk11_darwin_archive",
5556
"openjdk11_darwin_aarch64_archive",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ http_archive(
1212
)
1313

1414
http_archive(
15-
{remote_java_tools_test_darwin}
15+
{remote_java_tools_test_darwin_x86_64}
16+
)
17+
18+
http_archive(
19+
{remote_java_tools_test_darwin_arm64}
1620
)
1721

1822
#################################### JDK 11 ####################################

‎src/test/shell/testenv.sh.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,11 @@ EOF
298298
"openjdk_win_minimal"
299299
"remote_coverage_tools"
300300
"remote_java_tools_for_testing"
301-
"remote_java_tools_darwin_for_testing"
301+
"remote_java_tools_darwin_x86_64_for_testing"
302+
"remote_java_tools_darwin_arm64_for_testing"
302303
"remote_java_tools_test"
303-
"remote_java_tools_test_darwin"
304+
"remote_java_tools_test_darwin_x86_64"
305+
"remote_java_tools_test_darwin_arm64"
304306
"remote_java_tools_test_linux"
305307
"remote_java_tools_test_windows"
306308
"remote_java_tools_linux_for_testing"

‎tools/jdk/BUILD.tools

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ alias(
146146
)
147147
for OS in [
148148
"linux",
149-
"darwin",
149+
"darwin_x86_64",
150+
"darwin_arm64",
150151
"windows",
151152
]
152153
]
@@ -163,7 +164,8 @@ alias(
163164
name = "ijar_prebuilt_binary_or_cc_binary",
164165
actual = select({
165166
"//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
166-
"//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
167+
"//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
168+
"//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
167169
"//src/conditions:windows": ":ijar_prebuilt_binary_windows",
168170
"//conditions:default": "@remote_java_tools//:ijar_cc_binary",
169171
}),
@@ -173,7 +175,8 @@ alias(
173175
name = "ijar_prebuilt_binary",
174176
actual = select({
175177
"//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
176-
"//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
178+
"//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
179+
"//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
177180
"//src/conditions:windows": ":ijar_prebuilt_binary_windows",
178181
}),
179182
)
@@ -193,7 +196,8 @@ alias(
193196
name = "singlejar_prebuilt_or_cc_binary",
194197
actual = select({
195198
"//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
196-
"//src/conditions:darwin": ":prebuilt_singlejar_darwin",
199+
"//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
200+
"//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
197201
"//src/conditions:windows": ":prebuilt_singlejar_windows",
198202
"//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
199203
}),
@@ -203,7 +207,8 @@ alias(
203207
name = "prebuilt_singlejar",
204208
actual = select({
205209
"//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
206-
"//src/conditions:darwin": ":prebuilt_singlejar_darwin",
210+
"//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
211+
"//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
207212
"//src/conditions:windows": ":prebuilt_singlejar_windows",
208213
}),
209214
)

0 commit comments

Comments
 (0)