From f0493407f55f47a2eeabbed621018239adb3287e Mon Sep 17 00:00:00 2001
From: Simon Mavi Stewart <simon_stewart@apple.com>
Date: Mon, 4 Nov 2024 12:21:40 +0000
Subject: [PATCH] Bump checkstyle to the latest version

---
 MODULE.bazel                            |   2 +-
 contrib_rules_jvm_deps_install.json     | 401 +++++++++++++++++++-----
 java/private/contrib_rules_jvm_deps.zip | Bin 234450 -> 255951 bytes
 3 files changed, 326 insertions(+), 77 deletions(-)

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 060352001dc19d2059ea205962c2f1526aa4ace0..b02451e425a1aeb2bc780eb70ffd69b8390ebcd2 100644
GIT binary patch
delta 17492
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

delta 6797
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