cp: fix failing builds

Author: shs96c

MODULE.bazel

@@ -28,13 +28,19 @@ bazel_dep(name = "rules_python", version = "1.6.3")
 bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "rules_ruby", version = "0.19.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")
@@ -179,7 +185,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",

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

java/maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -245838302,
-  "__RESOLVED_ARTIFACTS_HASH": -970209915,
+  "__INPUT_ARTIFACTS_HASH": -1472384799,
+  "__RESOLVED_ARTIFACTS_HASH": 867885942,
   "artifacts": {
     "com.beust:jcommander": {
       "shasums": {
@@ -201,10 +201,10 @@
     },
     "com.google.guava:guava": {
       "shasums": {
-        "jar": "1e301f0c52ac248b0b14fdc3d12283c77252d4d6f48521d572e7d8c4c2cc4ac7",
-        "sources": "79423ae87a2203950e0e3ce2a00682b3b8d8557e631bbf662dba5494fe3b55cb"
+        "jar": "95bde613be18dfa2f0b870e4029ac264d5ba6989967204fc92ffe9ad5370cf5e",
+        "sources": "88f973eb68ff21be8cce97c70e21d9a481669e5c2c7008ea72a868c54de07d0b"
       },
-      "version": "33.5.0-jre"
+      "version": "33.4.4-jre"
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
@@ -228,10 +228,10 @@
     },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "84d3a150518485f8140ea99b8a985656749629f6433c92b80c75b36aba3b099b",
-        "sources": "295938307f4016b3f128f7347101b236ada1394808104519c9e93cd61b64602b"
+        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
+        "sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
       },
-      "version": "3.1"
+      "version": "3.0.0"
     },
     "com.google.protobuf.nano:protobuf-javanano": {
       "shasums": {
@@ -1052,7 +1052,7 @@
     }
   },
   "conflict_resolution": {
-    "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1",
+    "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0",
     "commons-io:commons-io:2.20.0": "commons-io:commons-io:2.5",
     "io.projectreactor:reactor-core:3.6.2": "io.projectreactor:reactor-core:3.6.6",
     "net.bytebuddy:byte-buddy-agent:1.17.4": "net.bytebuddy:byte-buddy-agent:1.17.7",

java/private/java_test_suite.bzl

@@ -6,7 +6,6 @@ load(":junit5_test.bzl", "junit5_test")
 def java_test_suite(
         name,
         srcs,
-        runner = "junit5",
         test_suffixes = DEFAULT_TEST_SUFFIXES,
         package = None,
         deps = None,
@@ -21,7 +20,6 @@ def java_test_suite(
         define_library = java_library,
         # We want to use our own test runner
         define_test = junit5_test,
-        runner = runner,
         deps = deps,
         runtime_deps = runtime_deps,
         size = size,