From ef72058c79a4343f2688f7b1e426cb0b3f29bb83 Mon Sep 17 00:00:00 2001
From: keertk <keerthanakumar@google.com>
Date: Thu, 5 Oct 2023 06:17:47 -0700
Subject: [PATCH] [6.4.0] Update rules_java 5.5.1 (#19701)

Context:
https://github.com/bazelbuild/bazel/issues/19598#issuecomment-1740539160

~Release: https://github.com/bazelbuild/rules_java/releases/tag/6.3.2~
~BCR PR: https://github.com/bazelbuild/bazel-central-registry/pull/966~

Release: https://github.com/bazelbuild/rules_java/releases/tag/5.5.1
BCR PR: https://github.com/bazelbuild/bazel-central-registry/pull/967
---
 MODULE.bazel                                  | 2 +-
 distdir_deps.bzl                              | 9 ++++-----
 src/MODULE.tools                              | 2 +-
 src/test/shell/bazel/bazel_rules_java_test.sh | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index a4f732a550093a..744b9f1ae2bd9d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -21,7 +21,7 @@ bazel_dep(name = "zlib", version = "1.2.13")
 
 # The following are required when building without WORKSPACE SUFFIX
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "5.5.0")
+bazel_dep(name = "rules_java", version = "5.5.1")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 
 # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR.
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index 40d1c599924e59..c7fc4588e4477d 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -62,12 +62,11 @@ DIST_DEPS = {
         ],
     },
     "rules_java": {
-        "archive": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
-        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
-        "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
+        "archive": "rules_java-5.5.1.tar.gz",
+        "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0",
+        "strip_prefix": "",
         "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
-            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+            "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz",
         ],
         "used_in": [
             "additional_distfiles",
diff --git a/src/MODULE.tools b/src/MODULE.tools
index ff9d5e6d221e1c..ca51288b1d8037 100644
--- a/src/MODULE.tools
+++ b/src/MODULE.tools
@@ -1,7 +1,7 @@
 module(name = "bazel_tools")
 
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "5.5.0")
+bazel_dep(name = "rules_java", version = "5.5.1")
 bazel_dep(name = "rules_license", version = "0.0.3")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 bazel_dep(name = "rules_python", version = "0.4.0")
diff --git a/src/test/shell/bazel/bazel_rules_java_test.sh b/src/test/shell/bazel/bazel_rules_java_test.sh
index 7594e21655b535..21c9acb8374440 100755
--- a/src/test/shell/bazel/bazel_rules_java_test.sh
+++ b/src/test/shell/bazel/bazel_rules_java_test.sh
@@ -84,9 +84,10 @@ EOF
 
 function test_rules_java_repository_builds_itself() {
   write_default_bazelrc
+  setup_skylib_support
 
   # We test that a built-in @rules_java repository is buildable.
-  bazel build @rules_java//... &> $TEST_log \
+  bazel build -- @rules_java//... -@rules_java//toolchains/... &> $TEST_log \
       || fail "Build failed unexpectedly"
 }