diff --git a/.bazelrc b/.bazelrc
index 0f705a85..7aa04354 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,6 +11,9 @@ build --java_language_version=17
 build --tool_java_runtime_version=remotejdk_17
 build --tool_java_language_version=17
 
+build --experimental_strict_java_deps=strict
+build --explicit_java_test_deps
+
 # Make sure we get something helpful when tests fail
 test --verbose_failures
 test --test_output=errors
diff --git a/MODULE.bazel b/MODULE.bazel
index 7a3f31b5..ec82f8c1 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -133,31 +133,37 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "org.codehaus.mojo:animal-sniffer-annotations:1.21",
 ]
 
+io_grpc_version = "1.68.1"
+
+slf4j_version = "1.7.32"
+
+spotbugs_version = "4.8.6"
+
 maven.install(
     name = "contrib_rules_jvm_deps",
     artifacts = [
+        "com.github.spotbugs:spotbugs-annotations:%s" % spotbugs_version,
         "com.google.code.findbugs:jsr305:3.0.2",
-        "com.google.errorprone:error_prone_annotations:2.11.0",
-        "com.google.guava:guava:30.1.1-jre",
-        "commons-cli:commons-cli:1.5.0",
-        "io.grpc:grpc-api:1.40.0",
-        "io.grpc:grpc-core:1.40.0",
-        "io.grpc:grpc-netty:1.40.0",
-        "io.grpc:grpc-services:1.40.0",
-        "io.grpc:grpc-stub:1.40.0",
-        "org.slf4j:slf4j-simple:1.7.32",
-        "com.google.googlejavaformat:google-java-format:1.15.0",
+        "com.google.errorprone:error_prone_annotations:2.35.1",
+        "com.google.googlejavaformat:google-java-format:1.24.0",
+        "com.google.guava:guava:33.3.1-jre",
+        "commons-cli:commons-cli:1.9.0",
+        "io.grpc:grpc-api:%s" % io_grpc_version,
+        "io.grpc:grpc-core:%s" % io_grpc_version,
+        "io.grpc:grpc-netty:%s" % io_grpc_version,
+        "io.grpc:grpc-services:%s" % io_grpc_version,
+        "io.grpc:grpc-stub:%s" % io_grpc_version,
 
         # These can be versioned independently of the versions in `repositories.bzl`
         # so long as the version numbers are higher.
-        "org.junit.jupiter:junit-jupiter-engine:5.8.2",
-        "org.junit.jupiter:junit-jupiter-api:5.8.2",
-        "org.junit.platform:junit-platform-launcher:1.8.2",
-        "org.junit.platform:junit-platform-reporting:1.8.2",
-        "org.junit.vintage:junit-vintage-engine:5.8.2",
+        "org.junit.jupiter:junit-jupiter-engine",
+        "org.junit.jupiter:junit-jupiter-api",
+        "org.junit.platform:junit-platform-launcher",
+        "org.junit.platform:junit-platform-reporting",
+        "org.junit.vintage:junit-vintage-engine",
 
         # Open Test Alliance for the JVM dep
-        "org.opentest4j:opentest4j:1.2.0",
+        "org.opentest4j:opentest4j:1.3.0",
 
         # Checkstyle deps
         "com.puppycrawl.tools:checkstyle:10.20.0",
@@ -166,16 +172,23 @@ maven.install(
         "net.sourceforge.pmd:pmd-dist:7.7.0",
 
         # Spotbugs deps
-        "org.slf4j:slf4j-api:1.7.32",
-        "org.slf4j:slf4j-jdk14:1.7.32",
+        "org.slf4j:slf4j-api:%s" % slf4j_version,
+        "org.slf4j:slf4j-jdk14:%s" % slf4j_version,
+
+        # Used by us at runtime
+        "org.slf4j:slf4j-simple:%s" % slf4j_version,
 
         # We explicitly declare a protobuf runtime version
         # so that it coincides with the one we use to generate the code.
         "com.google.protobuf:protobuf-java:{}".format(PROTOBUF_JAVA_VERSION),
     ] + IO_GRPC_GRPC_JAVA_ARTIFACTS,
+    boms = [
+        "org.junit:junit-bom:5.11.3",
+    ],
     fail_if_repin_required = True,
     generate_compat_repositories = True,
     lock_file = "//:contrib_rules_jvm_deps_install.json",
+    resolver = "maven",
     strict_visibility = False,
 )
 
@@ -189,7 +202,7 @@ maven.artifact(
     artifact = "spotbugs",
     exclusions = ["org.slf4j:slf4j-api"],
     group = "com.github.spotbugs",
-    version = "4.7.0",
+    version = spotbugs_version,
 )
 use_repo(
     maven,
diff --git a/contrib_rules_jvm_deps_install.json b/contrib_rules_jvm_deps_install.json
index 959ddcb1..c796563b 100755
--- a/contrib_rules_jvm_deps_install.json
+++ b/contrib_rules_jvm_deps_install.json
@@ -1,18 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1807985906,
-  "__RESOLVED_ARTIFACTS_HASH": 2091084267,
-  "conflict_resolution": {
-    "com.google.code.gson:gson:2.9.0": "com.google.code.gson:gson:2.11.0",
-    "com.google.errorprone:error_prone_annotations:2.11.0": "com.google.errorprone:error_prone_annotations:2.28.0",
-    "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
-    "com.google.guava:guava:30.1.1-jre": "com.google.guava:guava:33.3.1-jre",
-    "com.google.guava:guava:31.0.1-android": "com.google.guava:guava:33.3.1-jre",
-    "com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
-    "junit:junit:4.12": "junit:junit:4.13.2",
-    "org.slf4j:slf4j-api:1.7.32": "org.slf4j:slf4j-api:1.7.36",
-    "org.slf4j:slf4j-simple:1.7.32": "org.slf4j:slf4j-simple:1.7.36"
-  },
+  "__INPUT_ARTIFACTS_HASH": 309274292,
+  "__RESOLVED_ARTIFACTS_HASH": -1804778098,
   "artifacts": {
     "com.fasterxml.jackson.core:jackson-core": {
       "shasums": {
@@ -46,15 +35,21 @@
     },
     "com.github.spotbugs:spotbugs": {
       "shasums": {
-        "jar": "94c44d86c83b8fe63b20023e510874aef721b1081982051706e1da841572f295"
+        "jar": "69fde8787971a26b2372d416015d806bf7df4f847f7121bd5eeef239324cf180"
       },
-      "version": "4.7.0"
+      "version": "4.8.6"
     },
     "com.github.spotbugs:spotbugs-annotations": {
       "shasums": {
-        "jar": "8e6677102aa0de50841644cf9a57d6d503550ad774049a76c75bf157a8beebd5"
+        "jar": "4548b74a815ed44f5480ca4f06204a8b00809dc7e5f6a825a9edf18f40377b65"
       },
-      "version": "4.7.0"
+      "version": "4.8.6"
+    },
+    "com.github.stephenc.jcip:jcip-annotations": {
+      "shasums": {
+        "jar": "4fccff8382aafc589962c4edb262f6aa595e34f1e11e61057d1c6a96e8fc7323"
+      },
+      "version": "1.0-1"
     },
     "com.google.android:annotations": {
       "shasums": {
@@ -100,15 +95,15 @@
     },
     "com.google.code.gson:gson": {
       "shasums": {
-        "jar": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b"
+        "jar": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d"
       },
-      "version": "2.11.0"
+      "version": "2.9.0"
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e"
+        "jar": "03b63fee38e3a86fda311af5a0357e64eea44909aab5251ed178119270508ff5"
       },
-      "version": "2.28.0"
+      "version": "2.35.1"
     },
     "com.google.flogger:flogger": {
       "shasums": {
@@ -124,15 +119,15 @@
     },
     "com.google.googlejavaformat:google-java-format": {
       "shasums": {
-        "jar": "4f546cfe159547ac3b9547daa9649e728f6abc254979c975f1cb9971793692c3"
+        "jar": "9a4e0b9f4ec4d71a8a1d3641fd481118100fda2eeab712dbdfd4b2a06e9de4ce"
       },
-      "version": "1.15.0"
+      "version": "1.24.0"
     },
     "com.google.guava:failureaccess": {
       "shasums": {
-        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
+        "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26"
       },
-      "version": "1.0.2"
+      "version": "1.0.1"
     },
     "com.google.guava:guava": {
       "shasums": {
@@ -160,9 +155,9 @@
     },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64"
+        "jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b"
       },
-      "version": "3.0.0"
+      "version": "1.3"
     },
     "com.google.protobuf:protobuf-java": {
       "shasums": {
@@ -172,9 +167,9 @@
     },
     "com.google.protobuf:protobuf-java-util": {
       "shasums": {
-        "jar": "849925333aac23f46f9a154a52e441117017d5673e04e5636993bcc3cf1924d9"
+        "jar": "dacc58b2c3d2fa8d4bddc1acb881e78d6cf7c137dd78bc1d67f6aca732436a8d"
       },
-      "version": "3.17.2"
+      "version": "3.25.5"
     },
     "com.google.re2j:re2j": {
       "shasums": {
@@ -286,9 +281,9 @@
     },
     "commons-cli:commons-cli": {
       "shasums": {
-        "jar": "bc8bb01fc0fad250385706e20f927ddcff6173f6339b387dc879237752567ac6"
+        "jar": "d3d530d0f28fd0fbbffe2b0b338f70e8cb96f1605579e2e3abd4db29cac24e69"
       },
-      "version": "1.5.0"
+      "version": "1.9.0"
     },
     "commons-codec:commons-codec": {
       "shasums": {
@@ -358,51 +353,57 @@
     },
     "io.grpc:grpc-api": {
       "shasums": {
-        "jar": "e8996c17a0ff6665c3463f6800259a3755aa3d4863c5d51737b93b11e818a0bd"
+        "jar": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-context": {
       "shasums": {
-        "jar": "31882abfcecc8d09ca87a4f514414c3abe0d8cd2a62b379249eb56d63edb9974"
+        "jar": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-core": {
       "shasums": {
-        "jar": "8d712597726a0478ed0a5e05cc5662e1a6b7b9efbe2d585d43c947ec94275b8b"
+        "jar": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-netty": {
       "shasums": {
-        "jar": "288f20dddbb78319e043ecd47e69f8eec1c6ac8fafae5ffb431315cbcb55d11d"
+        "jar": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-protobuf": {
       "shasums": {
-        "jar": "f6598354276a1511320e452a18483732632c9a73a2372b9ec0a66c9a8248f298"
+        "jar": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-protobuf-lite": {
       "shasums": {
-        "jar": "8bfc88d763eab03e7278ee3679e5c6ac0e8263c74eeaec3925dd1125a2bddade"
+        "jar": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-services": {
       "shasums": {
-        "jar": "45c4b3194960bfdf322300d18009bd1bbc786a84fb7f091ddc9cd847fb13c100"
+        "jar": "43b4cca51788ad219eb8e688cf646f35ba41118a5d2a38281d7cfcc73927d947"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.grpc:grpc-stub": {
       "shasums": {
-        "jar": "fbb5cede6583efc9c3b74ba934f49fbb82c9f0e5f9dab45bcfb2f1835c0545cb"
+        "jar": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47"
+      },
+      "version": "1.68.1"
+    },
+    "io.grpc:grpc-util": {
+      "shasums": {
+        "jar": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade"
       },
-      "version": "1.40.0"
+      "version": "1.68.1"
     },
     "io.methvin:directory-watcher": {
       "shasums": {
@@ -543,15 +544,15 @@
     },
     "jaxen:jaxen": {
       "shasums": {
-        "jar": "70feef9dd75ad064def05a3ce8975aeba515ee7d1be146d12199c8828a64174c"
+        "jar": "9499e487a66268f47b8307d130cd1e13a58392105e98a51f6a525db79c615cc5"
       },
-      "version": "1.2.0"
+      "version": "2.0.0"
     },
     "junit:junit": {
       "shasums": {
-        "jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3"
+        "jar": "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a"
       },
-      "version": "4.13.2"
+      "version": "4.12"
     },
     "me.tongfei:progressbar": {
       "shasums": {
@@ -565,17 +566,11 @@
       },
       "version": "5.12.1"
     },
-    "net.jcip:jcip-annotations": {
-      "shasums": {
-        "jar": "be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0"
-      },
-      "version": "1.0"
-    },
     "net.sf.saxon:Saxon-HE": {
       "shasums": {
-        "jar": "98c3a91e6e5aaf9b3e2b37601e04b214a6e67098493cdd8232fcb705fddcb674"
+        "jar": "575f8b696e3b6f9aa7a3bf01611b8bf1b84576b55ce29bc16656a53a147ef441"
       },
-      "version": "12.5"
+      "version": "12.4"
     },
     "net.sourceforge.pmd:pmd-ant": {
       "shasums": {
@@ -697,9 +692,9 @@
       },
       "version": "7.7.0"
     },
-    "net.sourceforge.pmd:pmd-languages-deps:pom": {
+    "net.sourceforge.pmd:pmd-languages-deps": {
       "shasums": {
-        "jar": "c2baf0a9a1fcc9f82b95c95692d8a75d9c147500cfee0c2d96e965b982d66bde"
+        "jar": null
       },
       "version": "7.7.0"
     },
@@ -801,9 +796,9 @@
     },
     "org.apache.bcel:bcel": {
       "shasums": {
-        "jar": "bdeb381d0d19999e221e6a0f8d8bf44f5b19c2e57eabf68b70dc098652aefaf5"
+        "jar": "a119a4420350dea669acfd84120ecc7e5742dcabcc82b0b9f9755dc692335aa2"
       },
-      "version": "6.5.0"
+      "version": "6.9.0"
     },
     "org.apache.commons:commons-lang3": {
       "shasums": {
@@ -813,9 +808,9 @@
     },
     "org.apache.commons:commons-text": {
       "shasums": {
-        "jar": "0812f284ac5dd0d617461d9a2ab6ac6811137f25122dfffd4788a4871e732d00"
+        "jar": "770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018"
       },
-      "version": "1.9"
+      "version": "1.10.0"
     },
     "org.apache.groovy:groovy": {
       "shasums": {
@@ -853,6 +848,18 @@
       },
       "version": "4.4.14"
     },
+    "org.apache.logging.log4j:log4j-api": {
+      "shasums": {
+        "jar": "92ec1fd36ab3bc09de6198d2d7c0914685c0f7127ea931acc32fd2ecdd82ea89"
+      },
+      "version": "2.23.1"
+    },
+    "org.apache.logging.log4j:log4j-core": {
+      "shasums": {
+        "jar": "7079368005fc34f56248f57f8a8a53361c3a53e9007d556dbc66fc669df081b5"
+      },
+      "version": "2.23.1"
+    },
     "org.apache.maven.doxia:doxia-core": {
       "shasums": {
         "jar": "5e49cd827bebbcea5829d3b3883d17ad1ce15ebd6394aeb50ad50d7dfd939fcd"
@@ -903,9 +910,9 @@
     },
     "org.checkerframework:checker-qual": {
       "shasums": {
-        "jar": "21e8dfe8103e125d96a329653ca81e87ac430326dbdbf299cea3dc1ae3f039a2"
+        "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6"
       },
-      "version": "3.48.1"
+      "version": "3.43.0"
     },
     "org.codehaus.mojo:animal-sniffer-annotations": {
       "shasums": {
@@ -945,9 +952,9 @@
     },
     "org.dom4j:dom4j": {
       "shasums": {
-        "jar": "549f3007c6290f6a901e57d1d331b4ed0e6bf7384f78bf10316ffceeca834de6"
+        "jar": "235a9167a8a199be04b5326d92927ca0adeb90d11f69fe2e821b34ce8433b591"
       },
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "org.hamcrest:hamcrest-core": {
       "shasums": {
@@ -999,45 +1006,45 @@
     },
     "org.junit.jupiter:junit-jupiter-api": {
       "shasums": {
-        "jar": "1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801"
+        "jar": "5d8147a60f49453973e250ed68701b7ff055964fe2462fc2cb1ec1d6d44889ba"
       },
-      "version": "5.8.2"
+      "version": "5.11.3"
     },
     "org.junit.jupiter:junit-jupiter-engine": {
       "shasums": {
-        "jar": "753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e"
+        "jar": "e62420c99f7c0d59a2159a2ef63e61877e9c80bd722c03ca8bf3bdcea050a589"
       },
-      "version": "5.8.2"
+      "version": "5.11.3"
     },
     "org.junit.platform:junit-platform-commons": {
       "shasums": {
-        "jar": "d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050"
+        "jar": "be262964b0b6b48de977c61d4f931df8cf61e80e750cc3f3a0a39cdd21c1008c"
       },
-      "version": "1.8.2"
+      "version": "1.11.3"
     },
     "org.junit.platform:junit-platform-engine": {
       "shasums": {
-        "jar": "0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59"
+        "jar": "0043f72f611664735da8dc9a308bf12ecd2236b05339351c4741edb4d8fab0da"
       },
-      "version": "1.8.2"
+      "version": "1.11.3"
     },
     "org.junit.platform:junit-platform-launcher": {
       "shasums": {
-        "jar": "822156409fd83e682e4c5199b3460054299b538a058c2c6d0f5c9b6a5bdb7594"
+        "jar": "b4727459201b0011beb0742bd807421a1fc8426b116193031ed87825bc2d4f04"
       },
-      "version": "1.8.2"
+      "version": "1.11.3"
     },
     "org.junit.platform:junit-platform-reporting": {
       "shasums": {
-        "jar": "d28048333b378d166f9ad38c2a8e34ac0fa1a29cc016cb279df53c8b54628fc3"
+        "jar": "b8e19dbebcae7d1ff30b9d767047fbf3694027c33dfa423b371693b7f6679ed1"
       },
-      "version": "1.8.2"
+      "version": "1.11.3"
     },
     "org.junit.vintage:junit-vintage-engine": {
       "shasums": {
-        "jar": "ebd567b84e380d5373c47de3c9616d84f7bef91f9f8a8e7fc925be68240c1ba4"
+        "jar": "d58022419bc76b3df4f479a2b3599d95e24464cd68fb7c2267f1a1a871215c47"
       },
-      "version": "5.8.2"
+      "version": "5.11.3"
     },
     "org.mozilla:rhino": {
       "shasums": {
@@ -1047,9 +1054,9 @@
     },
     "org.opentest4j:opentest4j": {
       "shasums": {
-        "jar": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2"
+        "jar": "48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b"
       },
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "org.ow2.asm:asm": {
       "shasums": {
@@ -1059,27 +1066,27 @@
     },
     "org.ow2.asm:asm-analysis": {
       "shasums": {
-        "jar": "37fd5392bb2cf4c15f202ffefd46d0e92bb34ff848c549f30d426a60d6b29495"
+        "jar": "7bc6bcbc21379948a0c8c467fb0f864206e5b818f6bc0b546872f5c9f941556f"
       },
-      "version": "9.3"
+      "version": "9.7"
     },
     "org.ow2.asm:asm-commons": {
       "shasums": {
-        "jar": "a347c24732db2aead106b6e5996a015b06a3ef86e790a4f75b61761f0d2f7f39"
+        "jar": "389bc247958e049fc9a0408d398c92c6d370c18035120395d4cba1d9d9304b7a"
       },
-      "version": "9.3"
+      "version": "9.7"
     },
     "org.ow2.asm:asm-tree": {
       "shasums": {
-        "jar": "ae629c2609f39681ef8d140a42a23800464a94f2d23e36d8f25cd10d5e4caff4"
+        "jar": "62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1"
       },
-      "version": "9.3"
+      "version": "9.7"
     },
     "org.ow2.asm:asm-util": {
       "shasums": {
-        "jar": "70f78f291ca0298afdb567fa85c5667869bc3da3914784816413853994962192"
+        "jar": "37a6414d36641973f1af104937c95d6d921b2ddb4d612c66c5a9f2b13fc14211"
       },
-      "version": "9.3"
+      "version": "9.7"
     },
     "org.pcollections:pcollections": {
       "shasums": {
@@ -1101,9 +1108,9 @@
     },
     "org.scala-lang.modules:scala-collection-compat_2.13": {
       "shasums": {
-        "jar": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec"
+        "jar": "9b8cc6028dab5813fe751950382499d655fe8777e2c4b07368eaa9d1116e049c"
       },
-      "version": "2.11.0"
+      "version": "2.8.1"
     },
     "org.scala-lang.modules:scala-parallel-collections_2.13": {
       "shasums": {
@@ -1155,9 +1162,9 @@
     },
     "org.slf4j:slf4j-api": {
       "shasums": {
-        "jar": "d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0"
+        "jar": "3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be"
       },
-      "version": "1.7.36"
+      "version": "1.7.32"
     },
     "org.slf4j:slf4j-jdk14": {
       "shasums": {
@@ -1167,9 +1174,9 @@
     },
     "org.slf4j:slf4j-simple": {
       "shasums": {
-        "jar": "2f39bed943d624dfa8f4102d0571283a10870b6aa36f197a8a506f147010c10f"
+        "jar": "d2fdd7b73ca2019a2062d145a0d86179a58f98c8c3e35ca7c735a27b3b5621c3"
       },
-      "version": "1.7.36"
+      "version": "1.7.32"
     },
     "org.xmlresolver:xmlresolver": {
       "shasums": {
@@ -1179,6 +1186,31 @@
       "version": "5.2.2"
     }
   },
+  "conflict_resolution": {
+    "info.picocli:picocli:4.7.5": "info.picocli:picocli:4.7.6",
+    "io.github.apex-dev-tools:apex-parser:4.0.0": "io.github.apex-dev-tools:apex-parser:4.3.0",
+    "io.github.apex-dev-tools:apex-parser:4.1.0": "io.github.apex-dev-tools:apex-parser:4.3.0",
+    "io.grpc:grpc-context:1.22.1": "io.grpc:grpc-context:1.68.1",
+    "net.sf.saxon:Saxon-HE:12.5": "net.sf.saxon:Saxon-HE:12.4",
+    "org.antlr:antlr4-runtime:4.9.1": "org.antlr:antlr4-runtime:4.13.2",
+    "org.antlr:antlr4-runtime:4.9.3": "org.antlr:antlr4-runtime:4.13.2",
+    "org.apache.commons:commons-lang3:3.12.0": "org.apache.commons:commons-lang3:3.14.0",
+    "org.apache.commons:commons-lang3:3.8.1": "org.apache.commons:commons-lang3:3.14.0",
+    "org.apache.commons:commons-text:1.3": "org.apache.commons:commons-text:1.10.0",
+    "org.apache.httpcomponents:httpcore:4.4.13": "org.apache.httpcomponents:httpcore:4.4.14",
+    "org.checkerframework:checker-compat-qual:2.5.3": "org.checkerframework:checker-compat-qual:2.5.5",
+    "org.checkerframework:checker-qual:3.42.0": "org.checkerframework:checker-qual:3.43.0",
+    "org.checkerframework:checker-qual:3.48.1": "org.checkerframework:checker-qual:3.43.0",
+    "org.codehaus.plexus:plexus-utils:3.1.1": "org.codehaus.plexus:plexus-utils:3.3.0",
+    "org.scala-lang.modules:scala-collection-compat_2.13:2.1.4": "org.scala-lang.modules:scala-collection-compat_2.13:2.8.1",
+    "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0": "org.scala-lang.modules:scala-collection-compat_2.13:2.8.1",
+    "org.scala-lang:scala-library:2.13.0": "org.scala-lang:scala-library:2.13.13",
+    "org.scala-lang:scala-library:2.13.1": "org.scala-lang:scala-library:2.13.13",
+    "org.scala-lang:scala-library:2.13.10": "org.scala-lang:scala-library:2.13.13",
+    "org.scala-lang:scala-library:2.13.12": "org.scala-lang:scala-library:2.13.13",
+    "org.scala-lang:scala-library:2.13.3": "org.scala-lang:scala-library:2.13.13",
+    "org.scala-lang:scala-library:2.13.8": "org.scala-lang:scala-library:2.13.13"
+  },
   "dependencies": {
     "com.github.nawforce:scala-json-rpc-upickle-json-serializer_2.13": [
       "com.github.nawforce:scala-json-rpc_2.13",
@@ -1196,13 +1228,14 @@
     ],
     "com.github.spotbugs:spotbugs": [
       "com.github.spotbugs:spotbugs-annotations",
+      "com.github.stephenc.jcip:jcip-annotations",
       "com.google.code.gson:gson",
       "jaxen:jaxen",
-      "net.jcip:jcip-annotations",
       "net.sf.saxon:Saxon-HE",
       "org.apache.bcel:bcel",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-text",
+      "org.apache.logging.log4j:log4j-core",
       "org.dom4j:dom4j",
       "org.ow2.asm:asm",
       "org.ow2.asm:asm-analysis",
@@ -1224,9 +1257,6 @@
       "com.google.http-client:google-http-client",
       "com.google.http-client:google-http-client-jackson2"
     ],
-    "com.google.code.gson:gson": [
-      "com.google.errorprone:error_prone_annotations"
-    ],
     "com.google.flogger:flogger": [
       "org.checkerframework:checker-compat-qual"
     ],
@@ -1259,9 +1289,11 @@
       "com.google.http-client:google-http-client"
     ],
     "com.google.protobuf:protobuf-java-util": [
+      "com.google.code.findbugs:jsr305",
       "com.google.code.gson:gson",
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
+      "com.google.j2objc:j2objc-annotations",
       "com.google.protobuf:protobuf-java"
     ],
     "com.google.summit:summit-ast": [
@@ -1378,8 +1410,10 @@
     "io.grpc:grpc-api": [
       "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
-      "com.google.guava:guava",
-      "io.grpc:grpc-context"
+      "com.google.guava:guava"
+    ],
+    "io.grpc:grpc-context": [
+      "io.grpc:grpc-api"
     ],
     "io.grpc:grpc-core": [
       "com.google.android:annotations",
@@ -1387,15 +1421,19 @@
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
       "io.grpc:grpc-api",
+      "io.grpc:grpc-context",
       "io.perfmark:perfmark-api",
       "org.codehaus.mojo:animal-sniffer-annotations"
     ],
     "io.grpc:grpc-netty": [
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
+      "io.grpc:grpc-api",
       "io.grpc:grpc-core",
+      "io.grpc:grpc-util",
       "io.netty:netty-codec-http2",
       "io.netty:netty-handler-proxy",
+      "io.netty:netty-transport-native-unix-common",
       "io.perfmark:perfmark-api"
     ],
     "io.grpc:grpc-protobuf": [
@@ -1412,17 +1450,26 @@
       "io.grpc:grpc-api"
     ],
     "io.grpc:grpc-services": [
+      "com.google.code.gson:gson",
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
       "com.google.protobuf:protobuf-java-util",
       "io.grpc:grpc-core",
       "io.grpc:grpc-protobuf",
-      "io.grpc:grpc-stub"
+      "io.grpc:grpc-stub",
+      "io.grpc:grpc-util"
     ],
     "io.grpc:grpc-stub": [
+      "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
       "io.grpc:grpc-api"
     ],
+    "io.grpc:grpc-util": [
+      "com.google.guava:guava",
+      "io.grpc:grpc-api",
+      "io.grpc:grpc-core",
+      "org.codehaus.mojo:animal-sniffer-annotations"
+    ],
     "io.methvin:directory-watcher": [
       "net.java.dev.jna:jna",
       "org.slf4j:slf4j-api"
@@ -1492,36 +1539,31 @@
       "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64",
-      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64",
-      "io.netty:netty-tcnative-classes"
+      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64"
     ],
     "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64": [
       "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64",
-      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64",
-      "io.netty:netty-tcnative-classes"
+      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64"
     ],
     "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64": [
       "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64",
-      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64",
-      "io.netty:netty-tcnative-classes"
+      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64"
     ],
     "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64": [
       "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64",
-      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64",
-      "io.netty:netty-tcnative-classes"
+      "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64"
     ],
     "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64": [
       "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64",
       "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64",
       "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64",
-      "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64",
-      "io.netty:netty-tcnative-classes"
+      "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64"
     ],
     "io.netty:netty-transport": [
       "io.netty:netty-buffer",
@@ -1621,7 +1663,7 @@
       "net.sourceforge.pmd:pmd-cli",
       "net.sourceforge.pmd:pmd-core",
       "net.sourceforge.pmd:pmd-designer",
-      "net.sourceforge.pmd:pmd-languages-deps:pom",
+      "net.sourceforge.pmd:pmd-languages-deps",
       "org.apache.commons:commons-lang3",
       "org.slf4j:slf4j-simple"
     ],
@@ -1668,7 +1710,7 @@
       "net.sourceforge.pmd:pmd-core",
       "org.antlr:antlr4-runtime"
     ],
-    "net.sourceforge.pmd:pmd-languages-deps:pom": [
+    "net.sourceforge.pmd:pmd-languages-deps": [
       "net.sourceforge.pmd:pmd-apex",
       "net.sourceforge.pmd:pmd-coco",
       "net.sourceforge.pmd:pmd-cpp",
@@ -1755,14 +1797,16 @@
       "net.sourceforge.pmd:pmd-core",
       "org.antlr:antlr4-runtime"
     ],
+    "org.apache.bcel:bcel": [
+      "org.apache.commons:commons-lang3"
+    ],
     "org.apache.commons:commons-text": [
       "org.apache.commons:commons-lang3"
     ],
     "org.apache.httpcomponents.client5:httpclient5": [
       "commons-codec:commons-codec",
       "org.apache.httpcomponents.core5:httpcore5",
-      "org.apache.httpcomponents.core5:httpcore5-h2",
-      "org.slf4j:slf4j-api"
+      "org.apache.httpcomponents.core5:httpcore5-h2"
     ],
     "org.apache.httpcomponents.core5:httpcore5-h2": [
       "org.apache.httpcomponents.core5:httpcore5"
@@ -1771,6 +1815,9 @@
       "commons-logging:commons-logging",
       "org.apache.httpcomponents:httpcore"
     ],
+    "org.apache.logging.log4j:log4j-core": [
+      "org.apache.logging.log4j:log4j-api"
+    ],
     "org.apache.maven.doxia:doxia-core": [
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-text",
@@ -1849,7 +1896,6 @@
     ],
     "org.ow2.asm:asm-commons": [
       "org.ow2.asm:asm",
-      "org.ow2.asm:asm-analysis",
       "org.ow2.asm:asm-tree"
     ],
     "org.ow2.asm:asm-tree": [
@@ -1973,6 +2019,7 @@
       "edu.umd.cs.findbugs.classfile.engine.bcel",
       "edu.umd.cs.findbugs.classfile.impl",
       "edu.umd.cs.findbugs.config",
+      "edu.umd.cs.findbugs.cwe",
       "edu.umd.cs.findbugs.detect",
       "edu.umd.cs.findbugs.filter",
       "edu.umd.cs.findbugs.graph",
@@ -1997,6 +2044,9 @@
     "com.github.spotbugs:spotbugs-annotations": [
       "edu.umd.cs.findbugs.annotations"
     ],
+    "com.github.stephenc.jcip:jcip-annotations": [
+      "net.jcip.annotations"
+    ],
     "com.google.android:annotations": [
       "android.annotation"
     ],
@@ -2088,7 +2138,8 @@
       "com.google.googlejavaformat",
       "com.google.googlejavaformat.java",
       "com.google.googlejavaformat.java.filer",
-      "com.google.googlejavaformat.java.java14",
+      "com.google.googlejavaformat.java.java17",
+      "com.google.googlejavaformat.java.java21",
       "com.google.googlejavaformat.java.javadoc"
     ],
     "com.google.guava:failureaccess": [
@@ -2414,13 +2465,8 @@
     "io.grpc:grpc-api": [
       "io.grpc"
     ],
-    "io.grpc:grpc-context": [
-      "io.grpc"
-    ],
     "io.grpc:grpc-core": [
-      "io.grpc.inprocess",
-      "io.grpc.internal",
-      "io.grpc.util"
+      "io.grpc.internal"
     ],
     "io.grpc:grpc-netty": [
       "io.grpc.netty"
@@ -2437,6 +2483,7 @@
       "io.grpc.health.v1",
       "io.grpc.protobuf.services",
       "io.grpc.protobuf.services.internal",
+      "io.grpc.reflection.v1",
       "io.grpc.reflection.v1alpha",
       "io.grpc.services"
     ],
@@ -2444,6 +2491,9 @@
       "io.grpc.stub",
       "io.grpc.stub.annotations"
     ],
+    "io.grpc:grpc-util": [
+      "io.grpc.util"
+    ],
     "io.methvin:directory-watcher": [
       "io.methvin.watcher",
       "io.methvin.watcher.changeset",
@@ -2610,10 +2660,8 @@
       "org.junit.experimental.theories",
       "org.junit.experimental.theories.internal",
       "org.junit.experimental.theories.suppliers",
-      "org.junit.function",
       "org.junit.internal",
       "org.junit.internal.builders",
-      "org.junit.internal.management",
       "org.junit.internal.matchers",
       "org.junit.internal.requests",
       "org.junit.internal.runners",
@@ -2640,9 +2688,6 @@
       "com.sun.jna.ptr",
       "com.sun.jna.win32"
     ],
-    "net.jcip:jcip-annotations": [
-      "net.jcip.annotations"
-    ],
     "net.sf.saxon:Saxon-HE": [
       "net.sf.saxon",
       "net.sf.saxon.dom",
@@ -3093,6 +3138,7 @@
       "org.apache.commons.text.io",
       "org.apache.commons.text.lookup",
       "org.apache.commons.text.matcher",
+      "org.apache.commons.text.numbers",
       "org.apache.commons.text.similarity",
       "org.apache.commons.text.translate"
     ],
@@ -3339,6 +3385,72 @@
       "org.apache.http.ssl",
       "org.apache.http.util"
     ],
+    "org.apache.logging.log4j:log4j-api": [
+      "org.apache.logging.log4j",
+      "org.apache.logging.log4j.internal",
+      "org.apache.logging.log4j.message",
+      "org.apache.logging.log4j.simple",
+      "org.apache.logging.log4j.spi",
+      "org.apache.logging.log4j.status",
+      "org.apache.logging.log4j.util",
+      "org.apache.logging.log4j.util.internal"
+    ],
+    "org.apache.logging.log4j:log4j-core": [
+      "org.apache.logging.log4j.core",
+      "org.apache.logging.log4j.core.appender",
+      "org.apache.logging.log4j.core.appender.db",
+      "org.apache.logging.log4j.core.appender.db.jdbc",
+      "org.apache.logging.log4j.core.appender.mom",
+      "org.apache.logging.log4j.core.appender.mom.jeromq",
+      "org.apache.logging.log4j.core.appender.mom.kafka",
+      "org.apache.logging.log4j.core.appender.nosql",
+      "org.apache.logging.log4j.core.appender.rewrite",
+      "org.apache.logging.log4j.core.appender.rolling",
+      "org.apache.logging.log4j.core.appender.rolling.action",
+      "org.apache.logging.log4j.core.appender.routing",
+      "org.apache.logging.log4j.core.async",
+      "org.apache.logging.log4j.core.config",
+      "org.apache.logging.log4j.core.config.arbiters",
+      "org.apache.logging.log4j.core.config.builder.api",
+      "org.apache.logging.log4j.core.config.builder.impl",
+      "org.apache.logging.log4j.core.config.composite",
+      "org.apache.logging.log4j.core.config.json",
+      "org.apache.logging.log4j.core.config.plugins",
+      "org.apache.logging.log4j.core.config.plugins.convert",
+      "org.apache.logging.log4j.core.config.plugins.processor",
+      "org.apache.logging.log4j.core.config.plugins.util",
+      "org.apache.logging.log4j.core.config.plugins.validation",
+      "org.apache.logging.log4j.core.config.plugins.validation.constraints",
+      "org.apache.logging.log4j.core.config.plugins.validation.validators",
+      "org.apache.logging.log4j.core.config.plugins.visitors",
+      "org.apache.logging.log4j.core.config.properties",
+      "org.apache.logging.log4j.core.config.status",
+      "org.apache.logging.log4j.core.config.xml",
+      "org.apache.logging.log4j.core.config.yaml",
+      "org.apache.logging.log4j.core.filter",
+      "org.apache.logging.log4j.core.filter.mutable",
+      "org.apache.logging.log4j.core.impl",
+      "org.apache.logging.log4j.core.jackson",
+      "org.apache.logging.log4j.core.jmx",
+      "org.apache.logging.log4j.core.layout",
+      "org.apache.logging.log4j.core.layout.internal",
+      "org.apache.logging.log4j.core.lookup",
+      "org.apache.logging.log4j.core.message",
+      "org.apache.logging.log4j.core.net",
+      "org.apache.logging.log4j.core.net.ssl",
+      "org.apache.logging.log4j.core.osgi",
+      "org.apache.logging.log4j.core.parser",
+      "org.apache.logging.log4j.core.pattern",
+      "org.apache.logging.log4j.core.script",
+      "org.apache.logging.log4j.core.selector",
+      "org.apache.logging.log4j.core.time",
+      "org.apache.logging.log4j.core.time.internal",
+      "org.apache.logging.log4j.core.tools",
+      "org.apache.logging.log4j.core.tools.picocli",
+      "org.apache.logging.log4j.core.util",
+      "org.apache.logging.log4j.core.util.datetime",
+      "org.apache.logging.log4j.core.util.internal"
+    ],
     "org.apache.maven.doxia:doxia-core": [
       "org.apache.maven.doxia",
       "org.apache.maven.doxia.document",
@@ -3396,14 +3508,12 @@
       "org.checkerframework.checker.interning.qual",
       "org.checkerframework.checker.lock.qual",
       "org.checkerframework.checker.mustcall.qual",
-      "org.checkerframework.checker.nonempty.qual",
       "org.checkerframework.checker.nullness.qual",
       "org.checkerframework.checker.optional.qual",
       "org.checkerframework.checker.propkey.qual",
       "org.checkerframework.checker.regex.qual",
       "org.checkerframework.checker.signature.qual",
       "org.checkerframework.checker.signedness.qual",
-      "org.checkerframework.checker.sqlquotes.qual",
       "org.checkerframework.checker.tainting.qual",
       "org.checkerframework.checker.units.qual",
       "org.checkerframework.common.aliasing.qual",
@@ -3631,6 +3741,7 @@
       "org.junit.platform.commons.function",
       "org.junit.platform.commons.logging",
       "org.junit.platform.commons.support",
+      "org.junit.platform.commons.support.conversion",
       "org.junit.platform.commons.util"
     ],
     "org.junit.platform:junit-platform-engine": [
@@ -3641,7 +3752,8 @@
       "org.junit.platform.engine.support.descriptor",
       "org.junit.platform.engine.support.discovery",
       "org.junit.platform.engine.support.filter",
-      "org.junit.platform.engine.support.hierarchical"
+      "org.junit.platform.engine.support.hierarchical",
+      "org.junit.platform.engine.support.store"
     ],
     "org.junit.platform:junit-platform-launcher": [
       "org.junit.platform.launcher",
@@ -3653,7 +3765,13 @@
     ],
     "org.junit.platform:junit-platform-reporting": [
       "org.junit.platform.reporting.legacy",
-      "org.junit.platform.reporting.legacy.xml"
+      "org.junit.platform.reporting.legacy.xml",
+      "org.junit.platform.reporting.open.xml",
+      "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.api",
+      "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.core",
+      "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.java",
+      "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.root",
+      "org.junit.platform.reporting.shadow.org.opentest4j.reporting.schema"
     ],
     "org.junit.vintage:junit-vintage-engine": [
       "org.junit.vintage.engine",
@@ -3721,8 +3839,7 @@
     "org.scala-lang.modules:scala-collection-compat_2.13": [
       "scala.collection.compat",
       "scala.collection.compat.immutable",
-      "scala.util.control.compat",
-      "scala.util.matching.compat"
+      "scala.util.control.compat"
     ],
     "org.scala-lang.modules:scala-parallel-collections_2.13": [
       "scala.collection",
@@ -3880,6 +3997,7 @@
       "com.github.pathikrit:better-files_2.13",
       "com.github.spotbugs:spotbugs",
       "com.github.spotbugs:spotbugs-annotations",
+      "com.github.stephenc.jcip:jcip-annotations",
       "com.google.android:annotations",
       "com.google.api.grpc:proto-google-common-protos",
       "com.google.auth:google-auth-library-credentials",
@@ -3938,6 +4056,7 @@
       "io.grpc:grpc-protobuf-lite",
       "io.grpc:grpc-services",
       "io.grpc:grpc-stub",
+      "io.grpc:grpc-util",
       "io.methvin:directory-watcher",
       "io.methvin:directory-watcher-better-files_2.13",
       "io.netty:netty-buffer",
@@ -3969,7 +4088,6 @@
       "junit:junit",
       "me.tongfei:progressbar",
       "net.java.dev.jna:jna",
-      "net.jcip:jcip-annotations",
       "net.sf.saxon:Saxon-HE",
       "net.sourceforge.pmd:pmd-ant",
       "net.sourceforge.pmd:pmd-apex",
@@ -3991,7 +4109,7 @@
       "net.sourceforge.pmd:pmd-jsp",
       "net.sourceforge.pmd:pmd-julia",
       "net.sourceforge.pmd:pmd-kotlin",
-      "net.sourceforge.pmd:pmd-languages-deps:pom",
+      "net.sourceforge.pmd:pmd-languages-deps",
       "net.sourceforge.pmd:pmd-lua",
       "net.sourceforge.pmd:pmd-matlab",
       "net.sourceforge.pmd:pmd-modelica",
@@ -4017,6 +4135,8 @@
       "org.apache.httpcomponents.core5:httpcore5-h2",
       "org.apache.httpcomponents:httpclient",
       "org.apache.httpcomponents:httpcore",
+      "org.apache.logging.log4j:log4j-api",
+      "org.apache.logging.log4j:log4j-core",
       "org.apache.maven.doxia:doxia-core",
       "org.apache.maven.doxia:doxia-logging-api",
       "org.apache.maven.doxia:doxia-module-xdoc",
@@ -4104,12 +4224,14 @@
     "com.google.googlejavaformat:google-java-format": {
       "java.util.spi.ToolProvider": [
         "com.google.googlejavaformat.java.GoogleJavaFormatToolProvider"
+      ],
+      "javax.tools.Tool": [
+        "com.google.googlejavaformat.java.GoogleJavaFormatTool"
       ]
     },
     "io.grpc:grpc-core": {
       "io.grpc.LoadBalancerProvider": [
-        "io.grpc.internal.PickFirstLoadBalancerProvider",
-        "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider"
+        "io.grpc.internal.PickFirstLoadBalancerProvider"
       ],
       "io.grpc.NameResolverProvider": [
         "io.grpc.internal.DnsNameResolverProvider"
@@ -4117,7 +4239,11 @@
     },
     "io.grpc:grpc-netty": {
       "io.grpc.ManagedChannelProvider": [
-        "io.grpc.netty.NettyChannelProvider"
+        "io.grpc.netty.NettyChannelProvider",
+        "io.grpc.netty.UdsNettyChannelProvider"
+      ],
+      "io.grpc.NameResolverProvider": [
+        "io.grpc.netty.UdsNameResolverProvider"
       ],
       "io.grpc.ServerProvider": [
         "io.grpc.netty.NettyServerProvider"
@@ -4128,6 +4254,12 @@
         "io.grpc.protobuf.services.internal.HealthCheckingRoundRobinLoadBalancerProvider"
       ]
     },
+    "io.grpc:grpc-util": {
+      "io.grpc.LoadBalancerProvider": [
+        "io.grpc.util.OutlierDetectionLoadBalancerProvider",
+        "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider"
+      ]
+    },
     "io.netty:netty-common": {
       "reactor.blockhound.integration.BlockHoundIntegration": [
         "io.netty.util.internal.Hidden$NettyBlockHoundIntegration"
@@ -4311,6 +4443,26 @@
         "groovy.grape.GrabAnnotationTransformation"
       ]
     },
+    "org.apache.logging.log4j:log4j-api": {
+      "org.apache.logging.log4j.util.PropertySource": [
+        "org.apache.logging.log4j.util.EnvironmentPropertySource",
+        "org.apache.logging.log4j.util.SystemPropertiesPropertySource"
+      ]
+    },
+    "org.apache.logging.log4j:log4j-core": {
+      "javax.annotation.processing.Processor": [
+        "org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+      ],
+      "org.apache.logging.log4j.core.util.ContextDataProvider": [
+        "org.apache.logging.log4j.core.impl.ThreadContextDataProvider"
+      ],
+      "org.apache.logging.log4j.message.ThreadDumpMessage$ThreadInfoFactory": [
+        "org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory"
+      ],
+      "org.apache.logging.log4j.spi.Provider": [
+        "org.apache.logging.log4j.core.impl.Log4jProvider"
+      ]
+    },
     "org.jline:jline": {
       "org.jline.terminal.spi.JansiSupport": [
         "org.jline.terminal.impl.jansi.JansiSupportImpl"
@@ -4324,16 +4476,41 @@
         "org.junit.jupiter.engine.JupiterTestEngine"
       ]
     },
+    "org.junit.platform:junit-platform-engine": {
+      "org.junit.platform.engine.discovery.DiscoverySelectorIdentifierParser": [
+        "org.junit.platform.engine.discovery.ClassSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.ClasspathResourceSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.ClasspathRootSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.DirectorySelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.FileSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.IterationSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.MethodSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.ModuleSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.NestedClassSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.NestedMethodSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.PackageSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.UniqueIdSelector$IdentifierParser",
+        "org.junit.platform.engine.discovery.UriSelector$IdentifierParser"
+      ]
+    },
     "org.junit.platform:junit-platform-launcher": {
       "org.junit.platform.launcher.TestExecutionListener": [
         "org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
       ]
     },
+    "org.junit.platform:junit-platform-reporting": {
+      "org.junit.platform.launcher.TestExecutionListener": [
+        "org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener"
+      ]
+    },
     "org.junit.vintage:junit-vintage-engine": {
       "org.junit.platform.engine.TestEngine": [
         "org.junit.vintage.engine.VintageTestEngine"
       ]
     }
   },
+  "skipped": [
+    "net.sourceforge.pmd:pmd-languages-deps"
+  ],
   "version": "2"
 }
diff --git a/java/private/contrib_rules_jvm_deps.zip b/java/private/contrib_rules_jvm_deps.zip
index ea61551a..2cbc45ed 100644
Binary files a/java/private/contrib_rules_jvm_deps.zip and b/java/private/contrib_rules_jvm_deps.zip differ
diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/file/BuildFile.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/file/BuildFile.java
index 2972a07f..09b314a2 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/file/BuildFile.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/file/BuildFile.java
@@ -12,11 +12,13 @@
 
 public class BuildFile {
   private static final Logger logger = LoggerFactory.getLogger(BuildFile.class);
+
   /**
    * Full path the the build file e.g.
    * /root/workspace/project/src/main/com/gazelle/java/javaparser/BUILD.bazel
    */
   private final Path buildPath;
+
   /**
    * Contents of the BUILD file we're working with. Read on class creation, updated and written on
    * command
diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/JavaIdentifier.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/JavaIdentifier.java
index 3febeaba..a175af9a 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/JavaIdentifier.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/JavaIdentifier.java
@@ -6,6 +6,7 @@ public class JavaIdentifier implements Comparable<JavaIdentifier> {
 
   private final String packageName;
   private final String className;
+
   /**
    * Copied from the KnowTypeSolvers, this is the bazel dependency string where this package/class
    * will be found: The dependency name will be of the form: -
diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/ClasspathParserTest.java b/java/test/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/ClasspathParserTest.java
index 9f360242..063cbf27 100644
--- a/java/test/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/ClasspathParserTest.java
+++ b/java/test/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/ClasspathParserTest.java
@@ -408,6 +408,7 @@ private <T> TreeSet<T> treeSet(T... values) {
   static class JavaSource extends SimpleJavaFileObject {
     String fileSource;
 
+    @SuppressFBWarnings
     public JavaSource(Path path) {
       // The superclass requires that the path points at a filesystem not a jar, so we make up a
       // sketchy fake path for it.
diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BUILD.bazel b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BUILD.bazel
index 27b1bd99..d0b99661 100644
--- a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BUILD.bazel
+++ b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BUILD.bazel
@@ -35,6 +35,7 @@ java_test_suite(
     deps = [
         "//java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5",
         artifact("com.github.spotbugs:spotbugs-annotations", "contrib_rules_jvm_deps"),
+        artifact("junit:junit", "contrib_rules_jvm_tests"),
         artifact("org.junit.jupiter:junit-jupiter-api", "contrib_rules_jvm_tests"),
         artifact("org.junit.jupiter:junit-jupiter-params", "contrib_rules_jvm_tests"),
         artifact("org.junit.platform:junit-platform-engine", "contrib_rules_jvm_tests"),
@@ -54,6 +55,7 @@ java_test_suite(
     runner = "junit5",
     deps = [
         "//java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5",
+        artifact("junit:junit", "contrib_rules_jvm_tests"),
     ] + junit5_vintage_deps("contrib_rules_jvm_tests"),
 )
 
@@ -81,6 +83,7 @@ java_test(
     deps = [
         "//java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5",
         "//java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/sample:sharding-test-tests",
+        artifact("junit:junit", "contrib_rules_jvm_tests"),
         artifact("org.junit.jupiter:junit-jupiter-api", "contrib_rules_jvm_tests"),
         artifact("org.junit.platform:junit-platform-engine", "contrib_rules_jvm_tests"),
     ] + junit5_deps("contrib_rules_jvm_tests"),
diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestRunningSecurityManagerTest.java b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestRunningSecurityManagerTest.java
index 4cddf801..ce6e9170 100644
--- a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestRunningSecurityManagerTest.java
+++ b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestRunningSecurityManagerTest.java
@@ -17,6 +17,7 @@ void shouldStifleSystemExitCalls() {
   }
 
   @Test
+  @SuppressFBWarnings()
   void shouldDelegateToExistingSecurityManagerIfPresent() {
     SecurityManager permissive = new TestRunningSecurityManager();
     Permission permission = new RuntimePermission("example.permission");
diff --git a/tools/freeze-deps.py b/tools/freeze-deps.py
index a29b8dcf..3a85a491 100755
--- a/tools/freeze-deps.py
+++ b/tools/freeze-deps.py
@@ -54,7 +54,7 @@
 base = output_base.decode(encoding=sys.stdin.encoding)
 
 # Figure out the mangled repo name
-cmd = ["bazel", "cquery", "--output=starlark", "--starlark:expr=target.label.workspace_name", "@{name}//:outdated".format(name = args.repo)]
+cmd = ["bazel", "cquery", "--output=starlark", "--starlark:expr=target.label.workspace_name", "@{name}//:pin".format(name = args.repo)]
 base_dir = subprocess.check_output(cmd, cwd=cwd, stderr=subprocess.DEVNULL).decode('utf-8').strip()
 
 root = Path(base) / "external" / base_dir