diff --git a/MODULE.bazel b/MODULE.bazel
index 97f13956..7676a732 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -160,7 +160,7 @@ maven.install(
         "org.opentest4j:opentest4j:1.2.0",
 
         # Checkstyle deps
-        "com.puppycrawl.tools:checkstyle:10.2",
+        "com.puppycrawl.tools:checkstyle:10.20.0",
 
         # PMD deps
         "net.sourceforge.pmd:pmd-dist:6.46.0",
diff --git a/contrib_rules_jvm_deps_install.json b/contrib_rules_jvm_deps_install.json
index 3244070c..c11fd661 100755
--- a/contrib_rules_jvm_deps_install.json
+++ b/contrib_rules_jvm_deps_install.json
@@ -1,10 +1,13 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -661500966,
-  "__RESOLVED_ARTIFACTS_HASH": -1503133859,
+  "__INPUT_ARTIFACTS_HASH": -1045382214,
+  "__RESOLVED_ARTIFACTS_HASH": -1611055006,
   "conflict_resolution": {
-    "com.google.guava:guava:30.1.1-jre": "com.google.guava:guava:31.1-jre",
-    "com.google.guava:guava:31.0.1-android": "com.google.guava:guava:31.1-jre",
+    "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"
   },
   "artifacts": {
@@ -82,9 +85,9 @@
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec"
+        "jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e"
       },
-      "version": "2.11.0"
+      "version": "2.28.0"
     },
     "com.google.googlejavaformat:google-java-format": {
       "shasums": {
@@ -94,15 +97,15 @@
     },
     "com.google.guava:failureaccess": {
       "shasums": {
-        "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26"
+        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
       },
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "com.google.guava:guava": {
       "shasums": {
-        "jar": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab"
+        "jar": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90"
       },
-      "version": "31.1-jre"
+      "version": "33.3.1-jre"
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
@@ -124,9 +127,9 @@
     },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b"
+        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64"
       },
-      "version": "1.3"
+      "version": "3.0.0"
     },
     "com.google.protobuf:protobuf-java": {
       "shasums": {
@@ -160,9 +163,9 @@
     },
     "com.puppycrawl.tools:checkstyle": {
       "shasums": {
-        "jar": "fc86e3a0fbf88ddf6f240068e63d41778416a41041a3371e5a270c06b040870e"
+        "jar": "20ace49b1c1a3b9df50cc845e5edcff79c01b3eb251cae922571e76afec042c6"
       },
-      "version": "10.2"
+      "version": "10.20.0"
     },
     "com.squareup.okhttp:okhttp": {
       "shasums": {
@@ -190,9 +193,9 @@
     },
     "commons-codec:commons-codec": {
       "shasums": {
-        "jar": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d"
+        "jar": "b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63"
       },
-      "version": "1.11"
+      "version": "1.15"
     },
     "commons-collections:commons-collections": {
       "shasums": {
@@ -208,9 +211,9 @@
     },
     "info.picocli:picocli": {
       "shasums": {
-        "jar": "b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4"
+        "jar": "ed441183f309b93f104ca9e071e314a4062a893184e18a3c7ad72ec9cba12ba0"
       },
-      "version": "4.6.3"
+      "version": "4.7.6"
     },
     "io.grpc:grpc-api": {
       "shasums": {
@@ -399,9 +402,9 @@
     },
     "net.sf.saxon:Saxon-HE": {
       "shasums": {
-        "jar": "e62e1a283b1aa610605fde18e9368a9ec6f24d878320eb74cfc1c1f2d432e8a6"
+        "jar": "98c3a91e6e5aaf9b3e2b37601e04b214a6e67098493cdd8232fcb705fddcb674"
       },
-      "version": "11.3"
+      "version": "12.5"
     },
     "net.sourceforge.pmd:pmd-core": {
       "shasums": {
@@ -550,9 +553,9 @@
     },
     "org.antlr:antlr4-runtime": {
       "shasums": {
-        "jar": "da66be0c98acfb29bc708300d05f1a3269c40f9984a4cb9251cf2ba1898d1334"
+        "jar": "dd3e8a13a2d669bf84fb8d834de35ce4875f27157698d206241ec8488aadcaf7"
       },
-      "version": "4.10.1"
+      "version": "4.13.2"
     },
     "org.apache.bcel:bcel": {
       "shasums": {
@@ -572,6 +575,24 @@
       },
       "version": "1.9"
     },
+    "org.apache.httpcomponents.client5:httpclient5": {
+      "shasums": {
+        "jar": "28c759254f4e35319e078bb6ffea75676608dc12cb243b24fb3c8732522977fe"
+      },
+      "version": "5.1.3"
+    },
+    "org.apache.httpcomponents.core5:httpcore5": {
+      "shasums": {
+        "jar": "f2bf2f2c7772169c9e30699719667ad30f9b46c4e9d7841907deb2d12d9923fe"
+      },
+      "version": "5.1.3"
+    },
+    "org.apache.httpcomponents.core5:httpcore5-h2": {
+      "shasums": {
+        "jar": "d0e78ba15aa8ebe77982b660ac4b09a95d6e035dbdbea762577dc1c8e2935807"
+      },
+      "version": "5.1.3"
+    },
     "org.apache.httpcomponents:httpclient": {
       "shasums": {
         "jar": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743"
@@ -580,9 +601,33 @@
     },
     "org.apache.httpcomponents:httpcore": {
       "shasums": {
-        "jar": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424"
+        "jar": "f956209e450cb1d0c51776dfbd23e53e9dd8db9a1298ed62b70bf0944ba63b28"
+      },
+      "version": "4.4.14"
+    },
+    "org.apache.maven.doxia:doxia-core": {
+      "shasums": {
+        "jar": "5e49cd827bebbcea5829d3b3883d17ad1ce15ebd6394aeb50ad50d7dfd939fcd"
+      },
+      "version": "1.12.0"
+    },
+    "org.apache.maven.doxia:doxia-logging-api": {
+      "shasums": {
+        "jar": "985306162c0a9f4c309d46109447f30f02bf6fc9bc16a3e039d59e1dabd0192f"
       },
-      "version": "4.4.13"
+      "version": "1.12.0"
+    },
+    "org.apache.maven.doxia:doxia-module-xdoc": {
+      "shasums": {
+        "jar": "e8731ba00a4edd34b20eff9e4a729c2045c62cb796c3e491692607de4476ab01"
+      },
+      "version": "1.12.0"
+    },
+    "org.apache.maven.doxia:doxia-sink-api": {
+      "shasums": {
+        "jar": "5dca6aaaa9e70d8a0766e143ddcf9db09de5fde0fbcc78cb635d74e764dfcca5"
+      },
+      "version": "1.12.0"
     },
     "org.apache.tomcat:annotations-api": {
       "shasums": {
@@ -590,6 +635,12 @@
       },
       "version": "6.0.53"
     },
+    "org.apache.xbean:xbean-reflect": {
+      "shasums": {
+        "jar": "104e5e9bb5a669f86722f32281960700f7ec8e3209ef51b23eb9b6d23d1629cb"
+      },
+      "version": "3.7"
+    },
     "org.apiguardian:apiguardian-api": {
       "shasums": {
         "jar": "b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38"
@@ -604,9 +655,9 @@
     },
     "org.checkerframework:checker-qual": {
       "shasums": {
-        "jar": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb"
+        "jar": "21e8dfe8103e125d96a329653ca81e87ac430326dbdbf299cea3dc1ae3f039a2"
       },
-      "version": "3.12.0"
+      "version": "3.48.1"
     },
     "org.codehaus.groovy:groovy": {
       "shasums": {
@@ -620,6 +671,30 @@
       },
       "version": "1.21"
     },
+    "org.codehaus.plexus:plexus-classworlds": {
+      "shasums": {
+        "jar": "52f77c5ec49f787c9c417ebed5d6efd9922f44a202f217376e4f94c0d74f3549"
+      },
+      "version": "2.6.0"
+    },
+    "org.codehaus.plexus:plexus-component-annotations": {
+      "shasums": {
+        "jar": "bde3617ce9b5bcf9584126046080043af6a4b3baea40a3b153f02e7bbc32acac"
+      },
+      "version": "2.1.0"
+    },
+    "org.codehaus.plexus:plexus-container-default": {
+      "shasums": {
+        "jar": "6dceb1246b188153bdcb6f962d543d51ddb672cca07cad94a78fbabc9edf0a39"
+      },
+      "version": "2.1.0"
+    },
+    "org.codehaus.plexus:plexus-utils": {
+      "shasums": {
+        "jar": "76d174792540e2775af94d03d10fb2d3c776e2cd0ac0ebf427d3e570072bb9ce"
+      },
+      "version": "3.3.0"
+    },
     "org.dom4j:dom4j": {
       "shasums": {
         "jar": "549f3007c6290f6a901e57d1d331b4ed0e6bf7384f78bf10316ffceeca834de6"
@@ -742,16 +817,10 @@
     },
     "org.xmlresolver:xmlresolver": {
       "shasums": {
-        "data": "0d2395c0811910ddaff0df08626d6f5bffa3de3e8e699bc93e561d6509d9e53e",
-        "jar": "734f37f9e43124ea4a9ce09f754ffd095167822cbe68e9244f17db02a2f9e11f"
-      },
-      "version": "4.2.0"
-    },
-    "xml-apis:xml-apis": {
-      "shasums": {
-        "jar": "a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad"
+        "data": "173904bdbd783ba0fac92c5bcc05da5d09f0ce7eed24346666ea0a239461f9b4",
+        "jar": "efc92bd7ed32b3e57095e0b3e872051ccfbbdcc980831ef33e89e38161a85222"
       },
-      "version": "1.4.01"
+      "version": "5.2.2"
     }
   },
   "dependencies": {
@@ -829,6 +898,9 @@
       "info.picocli:picocli",
       "net.sf.saxon:Saxon-HE",
       "org.antlr:antlr4-runtime",
+      "org.apache.maven.doxia:doxia-core",
+      "org.apache.maven.doxia:doxia-module-xdoc",
+      "org.checkerframework:checker-qual",
       "org.reflections:reflections"
     ],
     "com.squareup.okhttp:okhttp": [
@@ -1131,11 +1203,46 @@
     "org.apache.commons:commons-text": [
       "org.apache.commons:commons-lang3"
     ],
-    "org.apache.httpcomponents:httpclient": [
+    "org.apache.httpcomponents.client5:httpclient5": [
       "commons-codec:commons-codec",
+      "org.apache.httpcomponents.core5:httpcore5",
+      "org.apache.httpcomponents.core5:httpcore5-h2"
+    ],
+    "org.apache.httpcomponents.core5:httpcore5-h2": [
+      "org.apache.httpcomponents.core5:httpcore5"
+    ],
+    "org.apache.httpcomponents:httpclient": [
       "commons-logging:commons-logging",
       "org.apache.httpcomponents:httpcore"
     ],
+    "org.apache.maven.doxia:doxia-core": [
+      "org.apache.commons:commons-lang3",
+      "org.apache.commons:commons-text",
+      "org.apache.httpcomponents:httpclient",
+      "org.apache.httpcomponents:httpcore",
+      "org.apache.maven.doxia:doxia-logging-api",
+      "org.apache.maven.doxia:doxia-sink-api",
+      "org.codehaus.plexus:plexus-component-annotations",
+      "org.codehaus.plexus:plexus-container-default",
+      "org.codehaus.plexus:plexus-utils"
+    ],
+    "org.apache.maven.doxia:doxia-logging-api": [
+      "org.codehaus.plexus:plexus-container-default"
+    ],
+    "org.apache.maven.doxia:doxia-module-xdoc": [
+      "org.apache.maven.doxia:doxia-core",
+      "org.apache.maven.doxia:doxia-sink-api",
+      "org.codehaus.plexus:plexus-component-annotations",
+      "org.codehaus.plexus:plexus-utils"
+    ],
+    "org.apache.maven.doxia:doxia-sink-api": [
+      "org.apache.maven.doxia:doxia-logging-api"
+    ],
+    "org.codehaus.plexus:plexus-container-default": [
+      "org.apache.xbean:xbean-reflect",
+      "org.codehaus.plexus:plexus-classworlds",
+      "org.codehaus.plexus:plexus-utils"
+    ],
     "org.junit.jupiter:junit-jupiter-api": [
       "org.apiguardian:apiguardian-api",
       "org.junit.platform:junit-platform-commons",
@@ -1195,13 +1302,12 @@
       "org.slf4j:slf4j-api"
     ],
     "org.xmlresolver:xmlresolver": [
-      "org.apache.httpcomponents:httpclient",
-      "org.apache.httpcomponents:httpcore"
+      "org.apache.httpcomponents.client5:httpclient5",
+      "org.apache.httpcomponents.core5:httpcore5"
     ],
     "org.xmlresolver:xmlresolver:jar:data": [
-      "org.apache.httpcomponents:httpclient",
-      "org.apache.httpcomponents:httpcore",
-      "xml-apis:xml-apis"
+      "org.apache.httpcomponents.client5:httpclient5",
+      "org.apache.httpcomponents.core5:httpcore5"
     ]
   },
   "packages": {
@@ -1453,6 +1559,7 @@
       "com.puppycrawl.tools.checkstyle.grammar.javadoc",
       "com.puppycrawl.tools.checkstyle.gui",
       "com.puppycrawl.tools.checkstyle.meta",
+      "com.puppycrawl.tools.checkstyle.site",
       "com.puppycrawl.tools.checkstyle.utils",
       "com.puppycrawl.tools.checkstyle.xpath",
       "com.puppycrawl.tools.checkstyle.xpath.iterators"
@@ -1722,6 +1829,7 @@
       "net.sf.saxon.expr",
       "net.sf.saxon.expr.accum",
       "net.sf.saxon.expr.compat",
+      "net.sf.saxon.expr.elab",
       "net.sf.saxon.expr.flwor",
       "net.sf.saxon.expr.instruct",
       "net.sf.saxon.expr.number",
@@ -1739,7 +1847,6 @@
       "net.sf.saxon.ma.arrays",
       "net.sf.saxon.ma.json",
       "net.sf.saxon.ma.map",
-      "net.sf.saxon.ma.parray",
       "net.sf.saxon.ma.trie",
       "net.sf.saxon.ma.zeno",
       "net.sf.saxon.om",
@@ -2087,6 +2194,82 @@
       "org.apache.commons.text.similarity",
       "org.apache.commons.text.translate"
     ],
+    "org.apache.httpcomponents.client5:httpclient5": [
+      "org.apache.hc.client5.http",
+      "org.apache.hc.client5.http.async",
+      "org.apache.hc.client5.http.async.methods",
+      "org.apache.hc.client5.http.auth",
+      "org.apache.hc.client5.http.classic",
+      "org.apache.hc.client5.http.classic.methods",
+      "org.apache.hc.client5.http.config",
+      "org.apache.hc.client5.http.cookie",
+      "org.apache.hc.client5.http.entity",
+      "org.apache.hc.client5.http.entity.mime",
+      "org.apache.hc.client5.http.impl",
+      "org.apache.hc.client5.http.impl.async",
+      "org.apache.hc.client5.http.impl.auth",
+      "org.apache.hc.client5.http.impl.classic",
+      "org.apache.hc.client5.http.impl.cookie",
+      "org.apache.hc.client5.http.impl.io",
+      "org.apache.hc.client5.http.impl.nio",
+      "org.apache.hc.client5.http.impl.routing",
+      "org.apache.hc.client5.http.io",
+      "org.apache.hc.client5.http.nio",
+      "org.apache.hc.client5.http.protocol",
+      "org.apache.hc.client5.http.psl",
+      "org.apache.hc.client5.http.routing",
+      "org.apache.hc.client5.http.socket",
+      "org.apache.hc.client5.http.ssl",
+      "org.apache.hc.client5.http.utils"
+    ],
+    "org.apache.httpcomponents.core5:httpcore5": [
+      "org.apache.hc.core5.annotation",
+      "org.apache.hc.core5.concurrent",
+      "org.apache.hc.core5.function",
+      "org.apache.hc.core5.http",
+      "org.apache.hc.core5.http.config",
+      "org.apache.hc.core5.http.impl",
+      "org.apache.hc.core5.http.impl.bootstrap",
+      "org.apache.hc.core5.http.impl.io",
+      "org.apache.hc.core5.http.impl.nio",
+      "org.apache.hc.core5.http.io",
+      "org.apache.hc.core5.http.io.entity",
+      "org.apache.hc.core5.http.io.ssl",
+      "org.apache.hc.core5.http.io.support",
+      "org.apache.hc.core5.http.message",
+      "org.apache.hc.core5.http.nio",
+      "org.apache.hc.core5.http.nio.command",
+      "org.apache.hc.core5.http.nio.entity",
+      "org.apache.hc.core5.http.nio.ssl",
+      "org.apache.hc.core5.http.nio.support",
+      "org.apache.hc.core5.http.nio.support.classic",
+      "org.apache.hc.core5.http.protocol",
+      "org.apache.hc.core5.http.ssl",
+      "org.apache.hc.core5.http.support",
+      "org.apache.hc.core5.io",
+      "org.apache.hc.core5.net",
+      "org.apache.hc.core5.pool",
+      "org.apache.hc.core5.reactor",
+      "org.apache.hc.core5.reactor.ssl",
+      "org.apache.hc.core5.ssl",
+      "org.apache.hc.core5.util"
+    ],
+    "org.apache.httpcomponents.core5:httpcore5-h2": [
+      "org.apache.hc.core5.http2",
+      "org.apache.hc.core5.http2.config",
+      "org.apache.hc.core5.http2.frame",
+      "org.apache.hc.core5.http2.hpack",
+      "org.apache.hc.core5.http2.impl",
+      "org.apache.hc.core5.http2.impl.io",
+      "org.apache.hc.core5.http2.impl.nio",
+      "org.apache.hc.core5.http2.impl.nio.bootstrap",
+      "org.apache.hc.core5.http2.nio",
+      "org.apache.hc.core5.http2.nio.command",
+      "org.apache.hc.core5.http2.nio.pool",
+      "org.apache.hc.core5.http2.nio.support",
+      "org.apache.hc.core5.http2.protocol",
+      "org.apache.hc.core5.http2.ssl"
+    ],
     "org.apache.httpcomponents:httpclient": [
       "org.apache.http.auth",
       "org.apache.http.auth.params",
@@ -2132,6 +2315,32 @@
       "org.apache.http.ssl",
       "org.apache.http.util"
     ],
+    "org.apache.maven.doxia:doxia-core": [
+      "org.apache.maven.doxia",
+      "org.apache.maven.doxia.document",
+      "org.apache.maven.doxia.document.io.xpp3",
+      "org.apache.maven.doxia.index",
+      "org.apache.maven.doxia.macro",
+      "org.apache.maven.doxia.macro.manager",
+      "org.apache.maven.doxia.macro.snippet",
+      "org.apache.maven.doxia.macro.toc",
+      "org.apache.maven.doxia.markup",
+      "org.apache.maven.doxia.parser",
+      "org.apache.maven.doxia.parser.manager",
+      "org.apache.maven.doxia.parser.module",
+      "org.apache.maven.doxia.sink.impl",
+      "org.apache.maven.doxia.util"
+    ],
+    "org.apache.maven.doxia:doxia-logging-api": [
+      "org.apache.maven.doxia.logging"
+    ],
+    "org.apache.maven.doxia:doxia-module-xdoc": [
+      "org.apache.maven.doxia.module.xdoc"
+    ],
+    "org.apache.maven.doxia:doxia-sink-api": [
+      "org.apache.maven.doxia.sink",
+      "org.codehaus.doxia.sink"
+    ],
     "org.apache.tomcat:annotations-api": [
       "javax.annotation",
       "javax.annotation.security",
@@ -2139,6 +2348,10 @@
       "javax.persistence",
       "javax.xml.ws"
     ],
+    "org.apache.xbean:xbean-reflect": [
+      "org.apache.xbean.propertyeditor",
+      "org.apache.xbean.recipe"
+    ],
     "org.apiguardian:apiguardian-api": [
       "org.apiguardian.api"
     ],
@@ -2158,12 +2371,15 @@
       "org.checkerframework.checker.initialization.qual",
       "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",
@@ -2171,7 +2387,7 @@
       "org.checkerframework.common.reflection.qual",
       "org.checkerframework.common.returnsreceiver.qual",
       "org.checkerframework.common.subtyping.qual",
-      "org.checkerframework.common.util.report.qual",
+      "org.checkerframework.common.util.count.report.qual",
       "org.checkerframework.common.value.qual",
       "org.checkerframework.dataflow.qual",
       "org.checkerframework.framework.qual"
@@ -2269,6 +2485,59 @@
     "org.codehaus.mojo:animal-sniffer-annotations": [
       "org.codehaus.mojo.animal_sniffer"
     ],
+    "org.codehaus.plexus:plexus-classworlds": [
+      "org.codehaus.classworlds",
+      "org.codehaus.plexus.classworlds",
+      "org.codehaus.plexus.classworlds.launcher",
+      "org.codehaus.plexus.classworlds.realm",
+      "org.codehaus.plexus.classworlds.strategy"
+    ],
+    "org.codehaus.plexus:plexus-component-annotations": [
+      "org.codehaus.plexus.component.annotations"
+    ],
+    "org.codehaus.plexus:plexus-container-default": [
+      "org.codehaus.plexus",
+      "org.codehaus.plexus.component",
+      "org.codehaus.plexus.component.builder",
+      "org.codehaus.plexus.component.collections",
+      "org.codehaus.plexus.component.composition",
+      "org.codehaus.plexus.component.configurator",
+      "org.codehaus.plexus.component.configurator.converters",
+      "org.codehaus.plexus.component.configurator.converters.basic",
+      "org.codehaus.plexus.component.configurator.converters.composite",
+      "org.codehaus.plexus.component.configurator.converters.lookup",
+      "org.codehaus.plexus.component.configurator.converters.special",
+      "org.codehaus.plexus.component.configurator.expression",
+      "org.codehaus.plexus.component.discovery",
+      "org.codehaus.plexus.component.factory",
+      "org.codehaus.plexus.component.factory.java",
+      "org.codehaus.plexus.component.manager",
+      "org.codehaus.plexus.component.repository",
+      "org.codehaus.plexus.component.repository.exception",
+      "org.codehaus.plexus.component.repository.io",
+      "org.codehaus.plexus.configuration",
+      "org.codehaus.plexus.configuration.io",
+      "org.codehaus.plexus.configuration.source",
+      "org.codehaus.plexus.configuration.xml",
+      "org.codehaus.plexus.container.initialization",
+      "org.codehaus.plexus.context",
+      "org.codehaus.plexus.lifecycle",
+      "org.codehaus.plexus.lifecycle.phase",
+      "org.codehaus.plexus.logging",
+      "org.codehaus.plexus.logging.console",
+      "org.codehaus.plexus.personality.plexus.lifecycle.phase"
+    ],
+    "org.codehaus.plexus:plexus-utils": [
+      "org.codehaus.plexus.util",
+      "org.codehaus.plexus.util.cli",
+      "org.codehaus.plexus.util.cli.shell",
+      "org.codehaus.plexus.util.dag",
+      "org.codehaus.plexus.util.introspection",
+      "org.codehaus.plexus.util.io",
+      "org.codehaus.plexus.util.reflection",
+      "org.codehaus.plexus.util.xml",
+      "org.codehaus.plexus.util.xml.pull"
+    ],
     "org.dom4j:dom4j": [
       "org.dom4j",
       "org.dom4j.bean",
@@ -2414,37 +2683,6 @@
       "org.xmlresolver.sources",
       "org.xmlresolver.tools",
       "org.xmlresolver.utils"
-    ],
-    "xml-apis:xml-apis": [
-      "javax.xml",
-      "javax.xml.datatype",
-      "javax.xml.namespace",
-      "javax.xml.parsers",
-      "javax.xml.stream",
-      "javax.xml.stream.events",
-      "javax.xml.stream.util",
-      "javax.xml.transform",
-      "javax.xml.transform.dom",
-      "javax.xml.transform.sax",
-      "javax.xml.transform.stax",
-      "javax.xml.transform.stream",
-      "javax.xml.validation",
-      "javax.xml.xpath",
-      "org.apache.xmlcommons",
-      "org.w3c.dom",
-      "org.w3c.dom.bootstrap",
-      "org.w3c.dom.css",
-      "org.w3c.dom.events",
-      "org.w3c.dom.html",
-      "org.w3c.dom.ls",
-      "org.w3c.dom.ranges",
-      "org.w3c.dom.stylesheets",
-      "org.w3c.dom.traversal",
-      "org.w3c.dom.views",
-      "org.w3c.dom.xpath",
-      "org.xml.sax",
-      "org.xml.sax.ext",
-      "org.xml.sax.helpers"
     ]
   },
   "repositories": {
@@ -2548,14 +2786,26 @@
       "org.apache.bcel:bcel",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-text",
+      "org.apache.httpcomponents.client5:httpclient5",
+      "org.apache.httpcomponents.core5:httpcore5",
+      "org.apache.httpcomponents.core5:httpcore5-h2",
       "org.apache.httpcomponents:httpclient",
       "org.apache.httpcomponents:httpcore",
+      "org.apache.maven.doxia:doxia-core",
+      "org.apache.maven.doxia:doxia-logging-api",
+      "org.apache.maven.doxia:doxia-module-xdoc",
+      "org.apache.maven.doxia:doxia-sink-api",
       "org.apache.tomcat:annotations-api",
+      "org.apache.xbean:xbean-reflect",
       "org.apiguardian:apiguardian-api",
       "org.checkerframework:checker-compat-qual",
       "org.checkerframework:checker-qual",
       "org.codehaus.groovy:groovy",
       "org.codehaus.mojo:animal-sniffer-annotations",
+      "org.codehaus.plexus:plexus-classworlds",
+      "org.codehaus.plexus:plexus-component-annotations",
+      "org.codehaus.plexus:plexus-container-default",
+      "org.codehaus.plexus:plexus-utils",
       "org.dom4j:dom4j",
       "org.hamcrest:hamcrest-core",
       "org.javassist:javassist",
@@ -2577,8 +2827,7 @@
       "org.slf4j:slf4j-jdk14",
       "org.slf4j:slf4j-simple",
       "org.xmlresolver:xmlresolver",
-      "org.xmlresolver:xmlresolver:jar:data",
-      "xml-apis:xml-apis"
+      "org.xmlresolver:xmlresolver:jar:data"
     ]
   },
   "services": {
diff --git a/java/private/contrib_rules_jvm_deps.zip b/java/private/contrib_rules_jvm_deps.zip
index 06035200..b02451e4 100644
Binary files a/java/private/contrib_rules_jvm_deps.zip and b/java/private/contrib_rules_jvm_deps.zip differ