[bazel] Update java rules to latest releases

MODULE.bazel

@@ -8,7 +8,7 @@ bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
 bazel_dep(name = "bazel_features", version = "1.32.0")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
-bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
+bazel_dep(name = "contrib_rules_jvm", version = "0.30.0")
 bazel_dep(name = "platforms", version = "1.0.0")
 
 # Required for the closure rules
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.2.8", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.17.5")
 bazel_dep(name = "rules_java", version = "8.7.1")
-bazel_dep(name = "rules_jvm_external", version = "6.8")
+bazel_dep(name = "rules_jvm_external", version = "6.9")
 bazel_dep(name = "rules_multitool", version = "1.3.0")
 bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.8.0")
@@ -29,13 +29,19 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "rules_ruby", version = "0.19.0")
 bazel_dep(name = "rules_rust", version = "0.67.0")
 
-# Until `rules_jvm_external` 6.8 ships
+# Until `rules_jvm_external` allows us to separate first and third party deps
 single_version_override(
     module_name = "rules_jvm_external",
     patch_strip = 1,
     patches = ["//java:rules_jvm_external_javadoc.patch"],
 )
 
+single_version_override(
+    module_name = "contrib_rules_jvm",
+    patch_strip = 1,
+    patches = ["//java:avoid-iterating-over-selects.patch"],
+)
+
 multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 multitool.hub(lockfile = "//:multitool.lock.json")
 use_repo(multitool, "multitool")
@@ -180,7 +186,9 @@ maven.install(
         "com.github.stephenc.jcip:jcip-annotations:1.0-1",
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.13.2",
-        "com.google.guava:guava:33.5.0-jre",
+        # When updating guava, be aware that up to at least 33.5.0-jre the module
+        # descriptor includes references to packages that don't exist.
+        "com.google.guava:guava:33.4.4-jre",
         "com.github.ben-manes.caffeine:caffeine:3.2.2",
         "com.google.auto:auto-common:1.2.2",
         "com.google.auto.service:auto-service:1.1.1",
@@ -253,7 +261,6 @@ maven.install(
     repositories = [
         "https://repo1.maven.org/maven2",
     ],
-    resolver = "maven",
     strict_visibility = True,
 )
 use_repo(maven, "maven", "unpinned_maven")

java/avoid-iterating-over-selects.patch

@@ -0,0 +1,38 @@
+diff --git a/java/private/create_jvm_test_suite.bzl b/java/private/create_jvm_test_suite.bzl
+index f318a0f..20acba2 100644
+--- a/java/private/create_jvm_test_suite.bzl
++++ b/java/private/create_jvm_test_suite.bzl
+@@ -113,12 +113,12 @@ def create_jvm_test_suite(
+     )
+
+     # Get any deps referenced in make vars
+-    make_var_fields = (kwargs.get("jvm_flags", []) +
+-                       kwargs.get("javacopts", []) +
+-                       kwargs.get("args", []) +
+-                       kwargs.get("env", {}).values())
+-    make_var_deps = collections.uniq([dep for dep in deps for flag in make_var_fields if dep in flag])
+-    make_var_runtime_deps = collections.uniq([dep for dep in runtime_deps for flag in make_var_fields if dep in flag])
++#     make_var_fields = (kwargs.get("jvm_flags", []) +
++#                        kwargs.get("javacopts", []) +
++#                        kwargs.get("args", []) +
++#                        kwargs.get("env", {}).values())
++#     make_var_deps = collections.uniq([dep for dep in deps for flag in make_var_fields if dep in flag])
++#     make_var_runtime_deps = collections.uniq([dep for dep in runtime_deps for flag in make_var_fields if dep in flag])
+
+     for src in test_srcs:
+         suffix = src.rfind(".")
+@@ -130,9 +130,9 @@ def create_jvm_test_suite(
+             size = size,
+             srcs = [src],
+             test_class = test_class,
+-            deps = [":" + deps_lib_name] + make_var_deps,
++            deps = [":" + deps_lib_name],
+             tags = tags,
+-            runtime_deps = [":" + runtime_deps_lib_name] + make_var_runtime_deps,
++            runtime_deps = [":" + runtime_deps_lib_name],
+             visibility = ["//visibility:private"],
+             **kwargs
+         )
+--
+2.51.1
+

java/defs.bzl

@@ -16,8 +16,8 @@ load("//java/private:module.bzl", _java_module = "java_module")
 load("//java/private:selenium_test.bzl", _selenium_test = "selenium_test")
 load("//java/private:suite.bzl", _java_selenium_test_suite = "java_selenium_test_suite")
 
-def java_test_suite(name, runner = "junit5", **kwargs):
-    _java_test_suite(name = name, runner = runner, **kwargs)
+def java_test_suite(name, **kwargs):
+    _java_test_suite(name = name, **kwargs)
 
 artifact = _artifact
 java_binary = _java_binary