From 9c8e61215a5f010ae640ec2e6978b901ac4c50c6 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Thu, 25 May 2023 14:23:33 +0200
Subject: [PATCH] Update rules_java to 6.0.0

---
 MODULE.bazel                                  |  2 +-
 distdir_deps.bzl                              | 12 ++++--------
 src/MODULE.tools                              |  2 +-
 src/test/shell/bazel/bazel_rules_java_test.sh | 15 +++++++--------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index b6f5fdc5c05cb4..fe82dabe8039c2 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -16,7 +16,7 @@ bazel_dep(name = "stardoc", version = "0.5.3", repo_name = "io_bazel_skydoc")
 bazel_dep(name = "zstd-jni", version = "1.5.2-3")
 bazel_dep(name = "zlib", version = "1.2.13")
 bazel_dep(name = "rules_cc", version = "0.0.6")
-bazel_dep(name = "rules_java", version = "5.5.0")
+bazel_dep(name = "rules_java", version = "6.0.0")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_jvm_external", version = "4.5")
 bazel_dep(name = "rules_python", version = "0.19.0")
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index ca47d4e33239f6..5136dfc975e158 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -62,21 +62,17 @@ DIST_DEPS = {
         "package_version": "0.0.6",
         "strip_prefix": "rules_cc-0.0.6",
     },
-    # TODO(pcloudy): DO NOT SUBMIT: Switch to release version of rules_java
     "rules_java": {
-        "archive": "fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa.tar.gz",
-        "sha256": "103306d728ff723e933c8fb34d09d145c0085bdbf8a804faeb46be67b122ae23",
-        "strip_prefix": "rules_java-fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa",
-        "urls": [
-            "https://github.com/meteorcloudy/rules_java/archive/fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa.tar.gz",
-        ],
+        "archive": "rules_java-6.0.0.tar.gz",
+        "sha256": "469b7f3b580b4fcf8112f4d6d0d5a4ce8e1ad5e21fee67d8e8335d5f8b3debab",
+        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.0.0/rules_java-6.0.0.tar.gz"],
         "used_in": [
             "additional_distfiles",
         ],
         "license_kinds": [
             "@rules_license//licenses/spdx:Apache-2.0",
         ],
-        "package_version": "5.4.1",
+        "package_version": "6.0.0",
     },
     # Used in src/test/java/com/google/devtools/build/lib/blackbox/framework/blackbox.WORKSAPCE
     "rules_proto": {
diff --git a/src/MODULE.tools b/src/MODULE.tools
index 2081aa437be655..1905a29f08ccf7 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.6")
-bazel_dep(name = "rules_java", version = "5.5.0")
+bazel_dep(name = "rules_java", version = "6.0.0")
 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 ffe06c05ace105..3858780c974c59 100755
--- a/src/test/shell/bazel/bazel_rules_java_test.sh
+++ b/src/test/shell/bazel/bazel_rules_java_test.sh
@@ -89,15 +89,14 @@ EOF
     fail "Bazel failed to build @rules_java"
 }
 
-# TODO(pcloudy): Probably don't need to exclude this test if we use a release version of rules_java
-# function test_rules_java_repository_builds_itself() {
-#   write_default_bazelrc
-#   setup_skylib_support
+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//... -@rules_java//toolchains/... &> $TEST_log \
-#       || fail "Build failed unexpectedly"
-# }
+  # We test that a built-in @rules_java repository is buildable.
+  bazel build -- @rules_java//... -@rules_java//toolchains/... &> $TEST_log \
+      || fail "Build failed unexpectedly"
+}
 
 
 function test_experimental_java_library_export_do_not_use() {