Skip to content

Commit 581e7cb

Browse files
authored
Revert "[6.2.0] Update java_tools v11.12 (#17761)"
This reverts commit c9e3eeb.
1 parent c9e3eeb commit 581e7cb

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

distdir_deps.bzl

+16-20
Original file line numberDiff line numberDiff line change
@@ -371,64 +371,60 @@ 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-v11.9.zip",
375+
"sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",
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/v11.9/java_tools-v11.9.zip",
378+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip",
379379
],
380380
"used_in": [
381381
"test_WORKSPACE_files",
382382
],
383-
"package_version": "11.12",
384383
},
385384
"remote_java_tools_linux": {
386385
"aliases": [
387386
"remote_java_tools_test_linux",
388387
"remote_java_tools_linux_for_testing",
389388
],
390-
"archive": "java_tools_linux-v11.12.zip",
391-
"sha256": "37f79597f5b8c1501b9c66ded8ac68c61205ad39ef3ceda0e24fbd0afa3cd97f",
389+
"archive": "java_tools_linux-v11.9.zip",
390+
"sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",
392391
"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",
392+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
393+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip",
395394
],
396395
"used_in": [
397396
"test_WORKSPACE_files",
398397
],
399-
"package_version": "11.12",
400398
},
401399
"remote_java_tools_windows": {
402400
"aliases": [
403401
"remote_java_tools_test_windows",
404402
"remote_java_tools_windows_for_testing",
405403
],
406-
"archive": "java_tools_windows-v11.12.zip",
407-
"sha256": "43432ce4814513d6497661b4fede691982b3bdef7a1907808b096291f56a8001",
404+
"archive": "java_tools_windows-v11.9.zip",
405+
"sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a",
408406
"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",
407+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip",
408+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip",
411409
],
412410
"used_in": [
413411
"test_WORKSPACE_files",
414412
],
415-
"package_version": "11.12",
416413
},
417414
"remote_java_tools_darwin": {
418415
"aliases": [
419416
"remote_java_tools_test_darwin",
420417
"remote_java_tools_darwin_for_testing",
421418
],
422-
"archive": "java_tools_darwin-v11.12.zip",
423-
"sha256": "aed319892b638efabd08405b8f835770e13e2465d20459876c5f457f2b6426f3",
419+
"archive": "java_tools_darwin-v11.9.zip",
420+
"sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4",
424421
"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",
422+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip",
423+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip",
427424
],
428425
"used_in": [
429426
"test_WORKSPACE_files",
430427
],
431-
"package_version": "11.12",
432428
},
433429
"remotejdk11_linux": {
434430
"aliases": [

tools/jdk/default_java_toolchain.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ DEFAULT_JAVACOPTS = [
4949
"-parameters",
5050
# https://github.com/bazelbuild/bazel/issues/15219
5151
"-Xep:ReturnValueIgnored:OFF",
52-
"-Xep:EmptyTopLevelDeclaration:OFF",
5352
]
5453

5554
# java_toolchain parameters without specifying javac, java.compiler,

0 commit comments

Comments
 (0)