Update java_tools v12.5 / rules_java 6.2.2

bazelbuild/java_tools#75

Closes #18902.

PiperOrigin-RevId: 548743338
Change-Id: Iabc8ecaa24cbc33f892eb97605fd560d16812579

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 = "6.1.1")
+bazel_dep(name = "rules_java", version = "6.2.2")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_jvm_external", version = "5.2")
 bazel_dep(name = "rules_python", version = "0.19.0")
@@ -28,12 +28,6 @@ single_version_override(
     patches = ["//third_party:rules_jvm_external_5.2.patch"],
 )
 
-single_version_override(
-    module_name = "rules_java",
-    patch_strip = 1,
-    patches = ["//third_party:rules_java_6.1.0.patch"],
-)
-
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     # We don't yet specify the maven coordinates in the MODULE.bazel to avoid duplicating information.

distdir_deps.bzl

@@ -67,11 +67,9 @@ DIST_DEPS = {
             "rules_java_builtin",
             "rules_java_builtin_for_testing",
         ],
-        "archive": "rules_java-6.1.1.tar.gz",
-        "sha256": "76402a50ae6859d50bd7aed8c1b8ef09dae5c1035bb3ca7d276f7f3ce659818a",
-        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.1.1/rules_java-6.1.1.tar.gz"],
-        "patches": ["//third_party:rules_java_6.1.0.patch"],
-        "patch_args": ["-p1"],
+        "archive": "rules_java-6.2.2.tar.gz",
+        "sha256": "847527aa7f74712e0a63af2670ba3ddc04e8ea3d8930a7947c17aebfb29d5294",
+        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.2.2/rules_java-6.2.2.tar.gz"],
         "workspace_file_content": "",
         "used_in": [
             "additional_distfiles",

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 = "6.1.1")
+bazel_dep(name = "rules_java", version = "6.2.2")
 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")