Update rules_java 7.11.1 / java_tools 13.8

Closes #23571. PiperOrigin-RevId: 672889778 Change-Id: I77191bcff909e2e14446fe15c44faa15d275352f
bazelbuild · Sep 10, 2024 · f92124a · f92124a
1 parent 75bb0c8
commit f92124a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -24,7 +24,7 @@ bazel_dep(name = "blake3", version = "1.5.1.bcr.1")
 bazel_dep(name = "sqlite3", version = "3.42.0.bcr.1")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "7.9.0")
+bazel_dep(name = "rules_java", version = "7.11.1")
 bazel_dep(name = "rules_graalvm", version = "0.11.1")
 bazel_dep(name = "rules_proto", version = "6.0.0")
 bazel_dep(name = "rules_jvm_external", version = "6.0")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/scripts/bootstrap/BUILD.bootstrap b/scripts/bootstrap/BUILD.bootstrap
@@ -18,6 +18,7 @@ default_java_toolchain(
  "-XX:+TieredCompilation",
  "-XX:TieredStopAtLevel=1",
  ],
+ oneversion = None, # avoid remote_java_tools dependency
  singlejar = ["//src/tools/singlejar:singlejar"],
  source_version = "21",
  tags = ["manual"],

diff --git a/src/MODULE.tools b/src/MODULE.tools
@@ -49,7 +49,7 @@ use_repo(buildozer_binary, "buildozer_binary")
 # Dependencies used to auto-load removed symbols and rules from Bazel (due to Starlarkification)
 # See also: --incompatible_autoload_externally, AutoloadSymbols
 bazel_dep(name = "protobuf", version = "3.19.6", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_java", version = "7.9.0")
+bazel_dep(name = "rules_java", version = "7.11.1")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_python", version = "0.22.1")
 # add rules_android

diff --git a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
@@ -136,6 +136,7 @@ default_java_toolchain(
  jacocorunner = ":dummy.jar",
  java_runtime = "@local_jdk//:jdk",
  javabuilder = [":dummy.jar"],
+ oneversion = ":dummy.jar",
  singlejar = [":dummy.jar"],
  source_version = "${JAVA_VERSION}",
  target_version = "${JAVA_VERSION}",

diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock
diff --git a/workspace_deps.bzl b/workspace_deps.bzl
@@ -25,9 +25,9 @@ WORKSPACE_REPOS = {
  "strip_prefix": "rules_cc-0.0.9",
  },
  "rules_java": {
- "archive": "rules_java-7.9.0.tar.gz",
- "sha256": "41131de4417de70b9597e6ebd515168ed0ba843a325dc54a81b92d7af9a7b3ea",
- "urls": ["https:/bazelbuild/rules_java/releases/download/7.9.0/rules_java-7.9.0.tar.gz"],
+ "archive": "rules_java-7.11.1.tar.gz",
+ "sha256": "6f3ce0e9fba979a844faba2d60467843fbf5191d8ca61fa3d2ea17655b56bb8c",
+ "urls": ["https:/bazelbuild/rules_java/releases/download/7.11.1/rules_java-7.11.1.tar.gz"],
  },
  # Used in src/test/java/com/google/devtools/build/lib/blackbox/framework/blackbox.WORKSAPCE
  "rules_proto": {