[8.0.0] Update @rules_java v8.5.1 (#24464)

Fixes #24455 Closes #24458. PiperOrigin-RevId: 699174983 Change-Id: Ib23a007cdb2ddc8fb5ae042c4bc2d10e9cd094e9 (cherry picked from commit 1a3aa80) Fixes #24463
bazelbuild · Nov 22, 2024 · 9f4be82 · 9f4be82
1 parent 7b1a825
commit 9f4be82
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -25,7 +25,7 @@ bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1")
 bazel_dep(name = "blake3", version = "1.5.1.bcr.1")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
 bazel_dep(name = "rules_cc", version = "0.0.16")
-bazel_dep(name = "rules_java", version = "8.5.0")
+bazel_dep(name = "rules_java", version = "8.5.1")
 bazel_dep(name = "rules_graalvm", version = "0.11.1")
 bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "rules_jvm_external", version = "6.0")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/MODULE.tools b/src/MODULE.tools
@@ -39,7 +39,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 = "29.0-rc3", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_java", version = "8.5.0")
+bazel_dep(name = "rules_java", version = "8.5.1")
 bazel_dep(name = "rules_cc", version = "0.0.16")
 bazel_dep(name = "rules_python", version = "0.40.0")
 bazel_dep(name = "rules_shell", version = "0.2.0")

diff --git a/src/main/starlark/docgen/BUILD b/src/main/starlark/docgen/BUILD
@@ -17,6 +17,7 @@ starlark_doc_extract(
         "@com_google_protobuf//bazel/toolchains:proto_toolchain_bzl",
         "@rules_cc//cc/common",
         "@rules_cc//cc/toolchains:toolchain_rules",
+        "@rules_java//java/common:proguard_spec_info_bzl",
         "@rules_java//java/private:proto_support",
     ],
 )

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AbstractMockJavaSupport.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AbstractMockJavaSupport.java
@@ -110,6 +110,15 @@ public void setupRulesJava(
               load("@rules_java//java/private:java_info.bzl", _JavaPluginInfo = "JavaPluginInfo")
               JavaPluginInfo = _JavaPluginInfo
               """);
+          config.overwrite(
+              "rules_java_workspace/java/private/proto_support.bzl",
+              """
+load("@rules_java//java/private:java_common.bzl", "java_common")
+def compile(*, injecting_rule_kind, enable_jspecify, include_compilation_info, **kwargs):
+    return java_common.compile(**kwargs)
+def merge(providers, *, merge_java_outputs = True, merge_source_jars = True):
+    return java_common.merge(providers)
+""");
           // mocks
           config.create("rules_java_workspace/toolchains/BUILD");
           config.create(

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
@@ -31,9 +31,9 @@ WORKSPACE_REPOS = {
         "strip_prefix": "protobuf-29.0-rc3",
     },
     "rules_java": {
-        "archive": "rules_java-8.5.0.tar.gz",
-        "sha256": "5c215757b9a6c3dd5312a3cdc4896cef3f0c5b31db31baa8da0d988685d42ae4",
-        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.5.0/rules_java-8.5.0.tar.gz"],
+        "archive": "rules_java-8.5.1.tar.gz",
+        "sha256": "1389206b2208c5f33a05dd96e51715b0855c480c082b7bb4889a8e07fcff536c",
+        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.5.1/rules_java-8.5.1.tar.gz"],
     },
     "bazel_skylib": {
         "archive": "bazel-skylib-1.6.1.tar.gz",