bazel: Update rules_jvm_external to latest HEAD

Our patches have been merged.

3 files changed, 3 insertions, 62 deletions

diff --git a/repositories.bzl b/repositories.bzl
index 48cd9869..cef21c20 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -60,17 +60,10 @@ def jazzer_dependencies(android = False):
         name = "rules_jvm_external",
         patch_args = ["-p1"],
         patches = [
-            # https://github.com/bazelbuild/rules_jvm_external/pull/933
-            # Fixes an incompatibility with latest Bazel introduced in
-            # https://github.com/bazelbuild/bazel/commit/d0e29582a2e788e8acdaf53fe30ab7f7dc592df3
-            "//third_party:rules_jvm_external-add-toolchain-to-maven-project-jar.patch",
-            # https://github.com/bazelbuild/rules_jvm_external/pull/952
-            # Fixes javadoc generation when using neverlink dependencies.
-            "//third_party:rules_jvm_external-add-neverlink-deps-to-javadoc-classpath.patch",
         ],
-        sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
-        strip_prefix = "rules_jvm_external-5.3",
-        url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.3/rules_jvm_external-5.3.tar.gz",
+        sha256 = "aa17db9b810b22e411bf722095be34eeb66c76819b9c3423ad7740f452016aa3",
+        strip_prefix = "rules_jvm_external-4b073de468eff9741406f475acb04e94bee7c9d0",
+        url = "https://github.com/bazelbuild/rules_jvm_external/archive/4b073de468eff9741406f475acb04e94bee7c9d0.tar.gz",
     )
 
     maybe(
diff --git a/third_party/rules_jvm_external-add-neverlink-deps-to-javadoc-classpath.patch b/third_party/rules_jvm_external-add-neverlink-deps-to-javadoc-classpath.patch
deleted file mode 100644
index 506bb189..00000000
--- a/third_party/rules_jvm_external-add-neverlink-deps-to-javadoc-classpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 920048a2b213e2c7cb6ce679ffa5a414054339f6 Mon Sep 17 00:00:00 2001
-From: Fabian Meumertzheim <fabian@meumertzhe.im>
-Date: Fri, 1 Sep 2023 22:12:42 +0200
-Subject: [PATCH] Add compile-only deps to javadocs classpath
-
-javadoc may have to inspect compile-only dependencies.
-
-Also removes a line that only added elements to a depset that are
-already contained in this depset.
----
- private/rules/javadoc.bzl | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/private/rules/javadoc.bzl b/private/rules/javadoc.bzl
-index 325aced1..3261248a 100644
---- a/private/rules/javadoc.bzl
-+++ b/private/rules/javadoc.bzl
-@@ -21,9 +21,12 @@ def _javadoc_impl(ctx):
- 
-     jar_file = ctx.actions.declare_file("%s.jar" % ctx.attr.name)
- 
--    # Gather additional files to add to the classpath
--    additional_deps = depset(transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps])
--    classpath = depset(transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps] + [additional_deps])
-+    # javadoc may need to inspect compile-time dependencies (neverlink)
-+    # of the runtime classpath.
-+    classpath = depset(
-+        transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps] +
-+                     [dep[JavaInfo].transitive_compile_time_jars for dep in ctx.attr.deps],
-+    )
- 
-     # javadoc options and javac options overlap, but we cannot
-     # necessarily rely on those to derive the javadoc options we need
diff --git a/third_party/rules_jvm_external-add-toolchain-to-maven-project-jar.patch b/third_party/rules_jvm_external-add-toolchain-to-maven-project-jar.patch
deleted file mode 100644
index 193d4dd6..00000000
--- a/third_party/rules_jvm_external-add-toolchain-to-maven-project-jar.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 388a879657e5e4e9ad6807279a84bf01bef6c14a Mon Sep 17 00:00:00 2001
-From: Nevena Kotlaja <kotlaja@google.com>
-Date: Tue, 18 Jul 2023 14:46:57 +0200
-Subject: [PATCH] Register java toolchain inside maven_project_jar
-
----
- private/rules/maven_project_jar.bzl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/private/rules/maven_project_jar.bzl b/private/rules/maven_project_jar.bzl
-index 5c8dae0c..d9118e0d 100644
---- a/private/rules/maven_project_jar.bzl
-+++ b/private/rules/maven_project_jar.bzl
-@@ -190,4 +190,5 @@ single artifact that other teams can download and use.
-             default = "@bazel_tools//tools/jdk:current_java_toolchain",
-         ),
-     },
-+    toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
- )