From 8388befc8504ac9df779fad8940ec4a112e16fe0 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon_stewart@apple.com>
Date: Wed, 18 Sep 2024 14:04:37 +0100
Subject: [PATCH] Ensure that the `pom` classifier isn't always downloaded
 (#1251)

Closes #1250
---
 MODULE.bazel                                  |   2 +
 WORKSPACE                                     |   2 +
 private/rules/coursier.bzl                    |  35 +-
 tests/bazel_run_tests.sh                      |  10 +
 .../regression_testing_coursier_install.json  | 465 ++++++++++++++++--
 5 files changed, 477 insertions(+), 37 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 75e4dbfef..5b834dd51 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -552,6 +552,8 @@ dev_maven.install(
         "androidx.arch.core:core-testing:aar:2.1.0",
         # https://github.com/bazelbuild/rules_jvm_external/issues/1028
         "build.buf:protovalidate:0.1.9",
+        # https://github.com/bazelbuild/rules_jvm_external/issues/1250
+        "com.github.spotbugs:spotbugs:4.7.0",
     ],
     fail_if_repin_required = True,
     generate_compat_repositories = True,
diff --git a/WORKSPACE b/WORKSPACE
index 395db3705..903b7ecd7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -276,6 +276,8 @@ maven_install(
         "androidx.arch.core:core-testing:aar:2.1.0",
         # https://github.com/bazelbuild/rules_jvm_external/issues/1028
         "build.buf:protovalidate:0.1.9",
+        # https://github.com/bazelbuild/rules_jvm_external/issues/1250
+        "com.github.spotbugs:spotbugs:4.7.0",
     ],
     fail_if_repin_required = True,
     generate_compat_repositories = True,
diff --git a/private/rules/coursier.bzl b/private/rules/coursier.bzl
index d5fec29b4..530a90bfb 100644
--- a/private/rules/coursier.bzl
+++ b/private/rules/coursier.bzl
@@ -925,12 +925,43 @@ def make_coursier_dep_tree(
     if (exec_result.return_code != 0):
         fail("Error while fetching artifact with coursier: " + exec_result.stderr)
 
-    return deduplicate_and_sort_artifacts(
+    dep_tree = deduplicate_and_sort_artifacts(
         json.decode(repository_ctx.read(repository_ctx.path("dep-tree.json"))),
         artifacts,
         excluded_artifacts,
         _is_verbose(repository_ctx),
     )
+    return rewrite_files_attribute_if_necessary(repository_ctx, dep_tree)
+
+def rewrite_files_attribute_if_necessary(repository_ctx, dep_tree):
+    # There are cases where `coursier` will download both the pom and the
+    # jar but will include the path to the pom instead of the jar in the
+    # `file` attribute. This differs from both gradle and maven. Massage the
+    # `file` attributes if necessary.
+    # https://github.com/bazelbuild/rules_jvm_external/issues/1250
+    amended_deps = []
+    for dep in dep_tree["dependencies"]:
+        if not dep.get("file", None):
+            amended_deps.append(dep)
+            continue
+
+        # You'd think we could use skylib here to do the heavy lifting, but
+        # this is a dependency of `maven_install`, which is loaded in the
+        # `repositories.bzl` file. That means we can't rely on anything that
+        # comes from skylib yet, since the repo isn't loaded. If we could
+        # call `maven_install` from `setup.bzl`, we'd be fine, but we can't
+        # do that because then there'd be nowhere to call the
+        # `pinned_maven_install`. Oh well, let's just do this the manual way.
+        if dep["file"].endswith(".pom"):
+            jar_path = dep["file"].removesuffix(".pom") + ".jar"
+            if repository_ctx.path(jar_path).exists:
+                dep["file"] = jar_path
+
+        amended_deps.append(dep)
+
+    dep_tree["dependencies"] = amended_deps
+
+    return dep_tree
 
 def remove_prefix(s, prefix):
     if s.startswith(prefix):
@@ -1032,7 +1063,7 @@ def _coursier_fetch_impl(repository_ctx):
             # This file comes from maven local, so handle it in two different ways depending if
             # dependency pinning is used:
             # a) If the repository is unpinned, we keep the file as is, but clear the url to skip it
-            # b) Otherwise, we clear the url and also simlink the file from the maven local directory
+            # b) Otherwise, we clear the url and also symlink the file from the maven local directory
             #    to file within the repository rule workspace
             print("Assuming maven local for artifact: %s" % artifact["coord"])
             artifact.update({"url": None})
diff --git a/tests/bazel_run_tests.sh b/tests/bazel_run_tests.sh
index cd50dd03d..8095ef3d0 100755
--- a/tests/bazel_run_tests.sh
+++ b/tests/bazel_run_tests.sh
@@ -259,6 +259,15 @@ function test_transitive_dependency_with_type_of_pom {
   bazel query @transitive_dependency_with_type_of_pom//:org_javamoney_moneta_moneta_core >> "$TEST_LOG" 2>&1
 }
 
+function test_when_both_pom_and_artifact_are_available_jar_artifact_is_present {
+  # The `maven_coordinates` of the target should be set to the coordinates of the jar
+  # If the `pom` classifier is asked for, something has gone wrong and no results will
+  # match
+  bazel query 'attr(tags, "com.github.spotbugs:spotbugs:4.7.0", @regression_testing_coursier//:com_github_spotbugs_spotbugs)' >> "$TEST_LOG" 2>&1
+
+  expect_log "@regression_testing_coursier//:com_github_spotbugs_spotbugs"
+}
+
 TESTS=(
   "test_maven_resolution"
   "test_dependency_aggregation"
@@ -277,6 +286,7 @@ TESTS=(
   "test_v1_lock_file_format"
   "test_dependency_pom_exclusion"
   "test_transitive_dependency_with_type_of_pom"
+  "test_when_both_pom_and_artifact_are_available_jar_artifact_is_present"
 )
 
 function run_tests() {
diff --git a/tests/custom_maven_install/regression_testing_coursier_install.json b/tests/custom_maven_install/regression_testing_coursier_install.json
index 485d317a4..85e5e822e 100644
--- a/tests/custom_maven_install/regression_testing_coursier_install.json
+++ b/tests/custom_maven_install/regression_testing_coursier_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 827556415,
-  "__RESOLVED_ARTIFACTS_HASH": -1895536858,
+  "__INPUT_ARTIFACTS_HASH": 1906932742,
+  "__RESOLVED_ARTIFACTS_HASH": 1555926687,
   "artifacts": {
     "android.arch.core:common": {
       "shasums": {
@@ -429,6 +429,18 @@
       },
       "version": "1.3.6"
     },
+    "com.github.spotbugs:spotbugs": {
+      "shasums": {
+        "jar": "94c44d86c83b8fe63b20023e510874aef721b1081982051706e1da841572f295"
+      },
+      "version": "4.7.0"
+    },
+    "com.github.spotbugs:spotbugs-annotations": {
+      "shasums": {
+        "jar": "8e6677102aa0de50841644cf9a57d6d503550ad774049a76c75bf157a8beebd5"
+      },
+      "version": "4.7.0"
+    },
     "com.github.stephenc.jcip:jcip-annotations": {
       "shasums": {
         "jar": "4fccff8382aafc589962c4edb262f6aa595e34f1e11e61057d1c6a96e8fc7323"
@@ -509,9 +521,9 @@
     },
     "com.google.code.gson:gson": {
       "shasums": {
-        "jar": "c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825"
+        "jar": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d"
       },
-      "version": "2.8.0"
+      "version": "2.9.0"
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
@@ -606,9 +618,9 @@
     },
     "com.nimbusds:nimbus-jose-jwt": {
       "shasums": {
-        "jar": "77128ed53756421bf59d2fc7f31554da29ea81cad8a5345977275adb7c5254c8"
+        "jar": "978cc75ee13ef021e288bf1aa78d8ad9f69cee558119a09a5a64e7fc92085000"
       },
-      "version": "9.40"
+      "version": "9.41.1"
     },
     "com.nimbusds:oauth2-oidc-sdk": {
       "shasums": {
@@ -975,6 +987,12 @@
       },
       "version": "1.4.7"
     },
+    "jaxen:jaxen": {
+      "shasums": {
+        "jar": "70feef9dd75ad064def05a3ce8975aeba515ee7d1be146d12199c8828a64174c"
+      },
+      "version": "1.2.0"
+    },
     "jline:jline": {
       "shasums": {
         "jar": "d8df0ffb12d87ca876271cda4d59b3feb94123882c1be1763b7faf2e0a0b0cbb"
@@ -1023,6 +1041,12 @@
       },
       "version": "4.2.2"
     },
+    "net.jcip:jcip-annotations": {
+      "shasums": {
+        "jar": "be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0"
+      },
+      "version": "1.0"
+    },
     "net.minidev:json-smart": {
       "shasums": {
         "jar": "ac3689112788e042088755e63ecd1f689adfeb04d7fb1cfd244513f94f82522c"
@@ -1041,6 +1065,12 @@
       },
       "version": "5.0.4"
     },
+    "net.sf.saxon:Saxon-HE": {
+      "shasums": {
+        "jar": "e62e1a283b1aa610605fde18e9368a9ec6f24d878320eb74cfc1c1f2d432e8a6"
+      },
+      "version": "11.3"
+    },
     "net.sourceforge.f2j:arpack_combined_all": {
       "shasums": {
         "jar": "9964fb948ef213548a79b23dd480af9d72f1450824fa006bbfea211ac1ffa6dc"
@@ -1095,6 +1125,12 @@
       },
       "version": "1.8.1"
     },
+    "org.apache.bcel:bcel": {
+      "shasums": {
+        "jar": "bdeb381d0d19999e221e6a0f8d8bf44f5b19c2e57eabf68b70dc098652aefaf5"
+      },
+      "version": "6.5.0"
+    },
     "org.apache.commons:commons-collections4": {
       "shasums": {
         "jar": "b1fe8b5968b57d8465425357ed2d9dc695504518bed2df5b565c4b8e68c1c8a5"
@@ -1109,9 +1145,9 @@
     },
     "org.apache.commons:commons-lang3": {
       "shasums": {
-        "jar": "6e8dc31e046508d9953c96534edf0c2e0bfe6f468966b5b842b3f87e43b6a847"
+        "jar": "d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e"
       },
-      "version": "3.7"
+      "version": "3.12.0"
     },
     "org.apache.commons:commons-math3": {
       "shasums": {
@@ -1119,6 +1155,12 @@
       },
       "version": "3.5"
     },
+    "org.apache.commons:commons-text": {
+      "shasums": {
+        "jar": "0812f284ac5dd0d617461d9a2ab6ac6811137f25122dfffd4788a4871e732d00"
+      },
+      "version": "1.9"
+    },
     "org.apache.curator:curator-test": {
       "shasums": {
         "jar": "05e800c48e3d4d1020a5bdb8fcc4a6ef706c88979516556e8fe47acf63000630"
@@ -1236,15 +1278,15 @@
     },
     "org.apache.httpcomponents:httpclient": {
       "shasums": {
-        "jar": "7e97724443ad2a25ad8c73183431d47cc7946271bcbbdfa91a8a17522a566573"
+        "jar": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743"
       },
-      "version": "4.5.5"
+      "version": "4.5.13"
     },
     "org.apache.httpcomponents:httpcore": {
       "shasums": {
-        "jar": "1b4a1c0b9b4222eda70108d3c6e2befd4a6be3d9f78ff53dd7a94966fdf51fc5"
+        "jar": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424"
       },
-      "version": "4.4.9"
+      "version": "4.4.13"
     },
     "org.apache.kafka:kafka-clients": {
       "shasums": {
@@ -1282,9 +1324,9 @@
       },
       "version": "0.5.0"
     },
-    "org.apache.zookeeper:zookeeper:pom": {
+    "org.apache.zookeeper:zookeeper": {
       "shasums": {
-        "jar": "61e821facd8010e33803fbe9301be3f3328eb3e80746af78455ad2b578b8514c"
+        "jar": "5f82a2d9ddadaa67a165fabc3488484cf3c2e26c0cc48138ace1fddd30f6e562"
       },
       "version": "3.4.13"
     },
@@ -1348,6 +1390,12 @@
       },
       "version": "3.0.22"
     },
+    "org.dom4j:dom4j": {
+      "shasums": {
+        "jar": "549f3007c6290f6a901e57d1d331b4ed0e6bf7384f78bf10316ffceeca834de6"
+      },
+      "version": "2.1.3"
+    },
     "org.eclipse.jetty.orbit:javax.servlet": {
       "shasums": {
         "jar": "a2cc192a076d9effd10becee8aacbe157f0fe2010fd4322e58aaeff198e56dbe"
@@ -1483,27 +1531,33 @@
     },
     "org.ow2.asm:asm": {
       "shasums": {
-        "jar": "917bda888bc543187325d5fbc1034207eed152574ef78df1734ca0aee40b7fc8"
+        "jar": "1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc"
       },
-      "version": "6.2"
+      "version": "9.3"
     },
     "org.ow2.asm:asm-analysis": {
       "shasums": {
-        "jar": "62b2c0d818fde5c52cf6404aa10836dbb170a2c3fa8466e656f0f991732fa01f"
+        "jar": "37fd5392bb2cf4c15f202ffefd46d0e92bb34ff848c549f30d426a60d6b29495"
       },
-      "version": "6.2"
+      "version": "9.3"
     },
     "org.ow2.asm:asm-commons": {
       "shasums": {
-        "jar": "15545913db06c987aa404f028e33501d9f27f8ced612f73727e3547ac4de878c"
+        "jar": "a347c24732db2aead106b6e5996a015b06a3ef86e790a4f75b61761f0d2f7f39"
       },
-      "version": "6.2"
+      "version": "9.3"
     },
     "org.ow2.asm:asm-tree": {
       "shasums": {
-        "jar": "02317d9ed739dab470a96f44de712fde51a811362ca26852b34324388e61257c"
+        "jar": "ae629c2609f39681ef8d140a42a23800464a94f2d23e36d8f25cd10d5e4caff4"
+      },
+      "version": "9.3"
+    },
+    "org.ow2.asm:asm-util": {
+      "shasums": {
+        "jar": "70f78f291ca0298afdb567fa85c5667869bc3da3914784816413853994962192"
       },
-      "version": "6.2"
+      "version": "9.3"
     },
     "org.pantsbuild:jarjar": {
       "shasums": {
@@ -1567,9 +1621,9 @@
     },
     "org.slf4j:slf4j-api": {
       "shasums": {
-        "jar": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79"
+        "jar": "602b712329c84b4a83c40464f4fdfd0fe4238c53ef397139a867064739dbf4e0"
       },
-      "version": "1.7.25"
+      "version": "1.8.0-beta4"
     },
     "org.slf4j:slf4j-simple": {
       "shasums": {
@@ -1589,11 +1643,24 @@
       },
       "version": "1.1.7.2"
     },
+    "org.xmlresolver:xmlresolver": {
+      "shasums": {
+        "data": "0d2395c0811910ddaff0df08626d6f5bffa3de3e8e699bc93e561d6509d9e53e",
+        "jar": "734f37f9e43124ea4a9ce09f754ffd095167822cbe68e9244f17db02a2f9e11f"
+      },
+      "version": "4.2.0"
+    },
     "org.yaml:snakeyaml": {
       "shasums": {
         "jar": "0a7b1063fcaeb806b40b728d01b9361d38e1ed8deb93f945994fec7c1761dad1"
       },
       "version": "1.19"
+    },
+    "xml-apis:xml-apis": {
+      "shasums": {
+        "jar": "a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad"
+      },
+      "version": "1.4.01"
     }
   },
   "dependencies": {
@@ -1650,7 +1717,7 @@
       "org.scala-sbt:util-interface"
     ],
     "com.101tec:zkclient": [
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.slf4j:slf4j-api"
     ],
     "com.android.support:animated-vector-drawable:aar": [
@@ -1893,6 +1960,26 @@
       "org.scala-lang:scala-library",
       "org.slf4j:slf4j-simple"
     ],
+    "com.github.spotbugs:spotbugs": [
+      "com.github.spotbugs:spotbugs-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.dom4j:dom4j",
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-commons",
+      "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util",
+      "org.slf4j:slf4j-api"
+    ],
+    "com.github.spotbugs:spotbugs-annotations": [
+      "com.google.code.findbugs:jsr305"
+    ],
     "com.google.android.gms:play-services-base:aar": [
       "com.google.android.gms:play-services-basement:aar",
       "com.google.android.gms:play-services-tasks:aar"
@@ -2020,7 +2107,7 @@
     ],
     "io.confluent:common-utils": [
       "com.101tec:zkclient",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.slf4j:slf4j-api"
     ],
     "io.confluent:kafka-avro-serializer": [
@@ -2177,6 +2264,10 @@
       "net.java.dev.jna:jna-platform",
       "org.slf4j:slf4j-api"
     ],
+    "net.sf.saxon:Saxon-HE": [
+      "org.xmlresolver:xmlresolver",
+      "org.xmlresolver:xmlresolver:jar:data"
+    ],
     "nz.ac.waikato.cms.weka:weka-stable": [
       "com.googlecode.matrix-toolkits-java:mtj",
       "com.googlecode.netlib-java:netlib-java",
@@ -2197,9 +2288,12 @@
       "org.tukaani:xz",
       "org.xerial.snappy:snappy-java"
     ],
+    "org.apache.commons:commons-text": [
+      "org.apache.commons:commons-lang3"
+    ],
     "org.apache.curator:curator-test": [
       "com.google.guava:guava",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.javassist:javassist"
     ],
     "org.apache.flink:flink-annotations": [
@@ -2365,7 +2459,7 @@
       "com.yammer.metrics:metrics-core",
       "net.sf.jopt-simple:jopt-simple",
       "org.apache.kafka:kafka-clients",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-reflect",
       "org.slf4j:slf4j-api"
@@ -2383,7 +2477,7 @@
       "org.apache.maven:maven-model",
       "org.eclipse.sisu:org.eclipse.sisu.plexus"
     ],
-    "org.apache.zookeeper:zookeeper:pom": [
+    "org.apache.zookeeper:zookeeper": [
       "io.netty:netty",
       "jline:jline",
       "org.apache.yetus:audience-annotations",
@@ -2442,6 +2536,11 @@
     "org.ow2.asm:asm-tree": [
       "org.ow2.asm:asm"
     ],
+    "org.ow2.asm:asm-util": [
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-tree"
+    ],
     "org.pantsbuild:jarjar": [
       "org.apache.ant:ant",
       "org.apache.maven:maven-plugin-api",
@@ -2461,6 +2560,16 @@
     ],
     "org.slf4j:slf4j-simple": [
       "org.slf4j:slf4j-api"
+    ],
+    "org.xmlresolver:xmlresolver": [
+      "org.apache.httpcomponents:httpclient",
+      "org.apache.httpcomponents:httpcore",
+      "xml-apis:xml-apis"
+    ],
+    "org.xmlresolver:xmlresolver:jar:data": [
+      "org.apache.httpcomponents:httpclient",
+      "org.apache.httpcomponents:httpcore",
+      "xml-apis:xml-apis"
     ]
   },
   "packages": {
@@ -2689,6 +2798,59 @@
     "com.github.spinalhdl:spinalhdl-sim_2.11": [
       "spinal.sim"
     ],
+    "com.github.spotbugs:spotbugs": [
+      "edu.umd.cs.findbugs",
+      "edu.umd.cs.findbugs.asm",
+      "edu.umd.cs.findbugs.ba",
+      "edu.umd.cs.findbugs.ba.bcp",
+      "edu.umd.cs.findbugs.ba.ca",
+      "edu.umd.cs.findbugs.ba.ch",
+      "edu.umd.cs.findbugs.ba.constant",
+      "edu.umd.cs.findbugs.ba.deref",
+      "edu.umd.cs.findbugs.ba.generic",
+      "edu.umd.cs.findbugs.ba.heap",
+      "edu.umd.cs.findbugs.ba.interproc",
+      "edu.umd.cs.findbugs.ba.jsr305",
+      "edu.umd.cs.findbugs.ba.npe",
+      "edu.umd.cs.findbugs.ba.obl",
+      "edu.umd.cs.findbugs.ba.type",
+      "edu.umd.cs.findbugs.ba.vna",
+      "edu.umd.cs.findbugs.bcel",
+      "edu.umd.cs.findbugs.bcel.generic",
+      "edu.umd.cs.findbugs.bugReporter",
+      "edu.umd.cs.findbugs.bytecode",
+      "edu.umd.cs.findbugs.charsets",
+      "edu.umd.cs.findbugs.classfile",
+      "edu.umd.cs.findbugs.classfile.analysis",
+      "edu.umd.cs.findbugs.classfile.engine",
+      "edu.umd.cs.findbugs.classfile.engine.asm",
+      "edu.umd.cs.findbugs.classfile.engine.bcel",
+      "edu.umd.cs.findbugs.classfile.impl",
+      "edu.umd.cs.findbugs.config",
+      "edu.umd.cs.findbugs.detect",
+      "edu.umd.cs.findbugs.filter",
+      "edu.umd.cs.findbugs.graph",
+      "edu.umd.cs.findbugs.gui",
+      "edu.umd.cs.findbugs.gui2",
+      "edu.umd.cs.findbugs.internalAnnotations",
+      "edu.umd.cs.findbugs.io",
+      "edu.umd.cs.findbugs.jaif",
+      "edu.umd.cs.findbugs.launchGUI",
+      "edu.umd.cs.findbugs.log",
+      "edu.umd.cs.findbugs.model",
+      "edu.umd.cs.findbugs.plan",
+      "edu.umd.cs.findbugs.plugins",
+      "edu.umd.cs.findbugs.props",
+      "edu.umd.cs.findbugs.sarif",
+      "edu.umd.cs.findbugs.sourceViewer",
+      "edu.umd.cs.findbugs.util",
+      "edu.umd.cs.findbugs.visitclass",
+      "edu.umd.cs.findbugs.workflow",
+      "edu.umd.cs.findbugs.xml"
+    ],
+    "com.github.spotbugs:spotbugs-annotations": [
+      "edu.umd.cs.findbugs.annotations"
+    ],
     "com.github.stephenc.jcip:jcip-annotations": [
       "net.jcip.annotations"
     ],
@@ -2727,6 +2889,8 @@
       "com.google.gson.internal",
       "com.google.gson.internal.bind",
       "com.google.gson.internal.bind.util",
+      "com.google.gson.internal.reflect",
+      "com.google.gson.internal.sql",
       "com.google.gson.reflect",
       "com.google.gson.stream"
     ],
@@ -3448,6 +3612,24 @@
       "javax.mail.search",
       "javax.mail.util"
     ],
+    "jaxen:jaxen": [
+      "org.jaxen",
+      "org.jaxen.dom",
+      "org.jaxen.dom4j",
+      "org.jaxen.expr",
+      "org.jaxen.expr.iter",
+      "org.jaxen.function",
+      "org.jaxen.function.ext",
+      "org.jaxen.function.xslt",
+      "org.jaxen.javabean",
+      "org.jaxen.jdom",
+      "org.jaxen.pattern",
+      "org.jaxen.saxpath",
+      "org.jaxen.saxpath.base",
+      "org.jaxen.saxpath.helpers",
+      "org.jaxen.util",
+      "org.jaxen.xom"
+    ],
     "jline:jline": [
       "jline"
     ],
@@ -3574,6 +3756,9 @@
       "com.sun.jna.platform.win32.COM.util.annotation",
       "com.sun.jna.platform.wince"
     ],
+    "net.jcip:jcip-annotations": [
+      "net.jcip.annotations"
+    ],
     "net.minidev:json-smart": [
       "net.minidev.json",
       "net.minidev.json.parser",
@@ -3594,6 +3779,67 @@
       "joptsimple.internal",
       "joptsimple.util"
     ],
+    "net.sf.saxon:Saxon-HE": [
+      "net.sf.saxon",
+      "net.sf.saxon.dom",
+      "net.sf.saxon.event",
+      "net.sf.saxon.expr",
+      "net.sf.saxon.expr.accum",
+      "net.sf.saxon.expr.compat",
+      "net.sf.saxon.expr.flwor",
+      "net.sf.saxon.expr.instruct",
+      "net.sf.saxon.expr.number",
+      "net.sf.saxon.expr.oper",
+      "net.sf.saxon.expr.parser",
+      "net.sf.saxon.expr.sort",
+      "net.sf.saxon.functions",
+      "net.sf.saxon.functions.hof",
+      "net.sf.saxon.functions.registry",
+      "net.sf.saxon.gizmo",
+      "net.sf.saxon.java",
+      "net.sf.saxon.jaxp",
+      "net.sf.saxon.lib",
+      "net.sf.saxon.ma",
+      "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",
+      "net.sf.saxon.pattern",
+      "net.sf.saxon.pull",
+      "net.sf.saxon.query",
+      "net.sf.saxon.regex",
+      "net.sf.saxon.regex.charclass",
+      "net.sf.saxon.resource",
+      "net.sf.saxon.s9api",
+      "net.sf.saxon.s9api.push",
+      "net.sf.saxon.s9api.streams",
+      "net.sf.saxon.sapling",
+      "net.sf.saxon.serialize",
+      "net.sf.saxon.serialize.charcode",
+      "net.sf.saxon.stax",
+      "net.sf.saxon.str",
+      "net.sf.saxon.style",
+      "net.sf.saxon.sxpath",
+      "net.sf.saxon.trace",
+      "net.sf.saxon.trans",
+      "net.sf.saxon.trans.packages",
+      "net.sf.saxon.trans.rules",
+      "net.sf.saxon.transpile",
+      "net.sf.saxon.tree",
+      "net.sf.saxon.tree.iter",
+      "net.sf.saxon.tree.jiter",
+      "net.sf.saxon.tree.linked",
+      "net.sf.saxon.tree.tiny",
+      "net.sf.saxon.tree.util",
+      "net.sf.saxon.tree.wrapper",
+      "net.sf.saxon.type",
+      "net.sf.saxon.value",
+      "net.sf.saxon.xpath",
+      "net.sf.saxon.z"
+    ],
     "net.sourceforge.f2j:arpack_combined_all": [
       "org.j_paine.formatter",
       "org.netlib.arpack",
@@ -3814,6 +4060,16 @@
       "org.apache.avro.util",
       "org.apache.avro.util.internal"
     ],
+    "org.apache.bcel:bcel": [
+      "org.apache.bcel",
+      "org.apache.bcel.classfile",
+      "org.apache.bcel.generic",
+      "org.apache.bcel.util",
+      "org.apache.bcel.verifier",
+      "org.apache.bcel.verifier.exc",
+      "org.apache.bcel.verifier.statics",
+      "org.apache.bcel.verifier.structurals"
+    ],
     "org.apache.commons:commons-collections4": [
       "org.apache.commons.collections4",
       "org.apache.commons.collections4.bag",
@@ -3869,12 +4125,16 @@
       "org.apache.commons.lang3",
       "org.apache.commons.lang3.arch",
       "org.apache.commons.lang3.builder",
+      "org.apache.commons.lang3.compare",
       "org.apache.commons.lang3.concurrent",
+      "org.apache.commons.lang3.concurrent.locks",
       "org.apache.commons.lang3.event",
       "org.apache.commons.lang3.exception",
+      "org.apache.commons.lang3.function",
       "org.apache.commons.lang3.math",
       "org.apache.commons.lang3.mutable",
       "org.apache.commons.lang3.reflect",
+      "org.apache.commons.lang3.stream",
       "org.apache.commons.lang3.text",
       "org.apache.commons.lang3.text.translate",
       "org.apache.commons.lang3.time",
@@ -3956,6 +4216,15 @@
       "org.apache.commons.math3.transform",
       "org.apache.commons.math3.util"
     ],
+    "org.apache.commons:commons-text": [
+      "org.apache.commons.text",
+      "org.apache.commons.text.diff",
+      "org.apache.commons.text.io",
+      "org.apache.commons.text.lookup",
+      "org.apache.commons.text.matcher",
+      "org.apache.commons.text.similarity",
+      "org.apache.commons.text.translate"
+    ],
     "org.apache.curator:curator-test": [
       "org.apache.curator-test.shaded.com.google.common.annotations",
       "org.apache.curator-test.shaded.com.google.common.base",
@@ -4932,6 +5201,29 @@
       "org.apache.yetus.audience",
       "org.apache.yetus.audience.tools"
     ],
+    "org.apache.zookeeper:zookeeper": [
+      "org.apache.jute",
+      "org.apache.jute.compiler",
+      "org.apache.jute.compiler.generated",
+      "org.apache.zookeeper",
+      "org.apache.zookeeper.client",
+      "org.apache.zookeeper.common",
+      "org.apache.zookeeper.data",
+      "org.apache.zookeeper.jmx",
+      "org.apache.zookeeper.proto",
+      "org.apache.zookeeper.server",
+      "org.apache.zookeeper.server.auth",
+      "org.apache.zookeeper.server.persistence",
+      "org.apache.zookeeper.server.quorum",
+      "org.apache.zookeeper.server.quorum.auth",
+      "org.apache.zookeeper.server.quorum.flexible",
+      "org.apache.zookeeper.server.upgrade",
+      "org.apache.zookeeper.server.util",
+      "org.apache.zookeeper.txn",
+      "org.apache.zookeeper.util",
+      "org.apache.zookeeper.version",
+      "org.apache.zookeeper.version.util"
+    ],
     "org.bouncycastle:bcpkix-jdk15on": [
       "org.bouncycastle.cert",
       "org.bouncycastle.cert.bc",
@@ -5366,6 +5658,22 @@
       "org.codehaus.plexus.util.xml",
       "org.codehaus.plexus.util.xml.pull"
     ],
+    "org.dom4j:dom4j": [
+      "org.dom4j",
+      "org.dom4j.bean",
+      "org.dom4j.datatype",
+      "org.dom4j.dom",
+      "org.dom4j.dtd",
+      "org.dom4j.io",
+      "org.dom4j.jaxb",
+      "org.dom4j.rule",
+      "org.dom4j.rule.pattern",
+      "org.dom4j.swing",
+      "org.dom4j.tree",
+      "org.dom4j.util",
+      "org.dom4j.xpath",
+      "org.dom4j.xpp"
+    ],
     "org.eclipse.jetty.orbit:javax.servlet": [
       "javax.servlet",
       "javax.servlet.annotation",
@@ -5628,6 +5936,9 @@
     "org.ow2.asm:asm-tree": [
       "org.objectweb.asm.tree"
     ],
+    "org.ow2.asm:asm-util": [
+      "org.objectweb.asm.util"
+    ],
     "org.pantsbuild:jarjar": [
       "org.pantsbuild.jarjar",
       "org.pantsbuild.jarjar.misplaced",
@@ -5764,6 +6075,18 @@
       "org.xerial.snappy",
       "org.xerial.snappy.buffer"
     ],
+    "org.xmlresolver:xmlresolver": [
+      "org.xmlresolver",
+      "org.xmlresolver.cache",
+      "org.xmlresolver.catalog.entry",
+      "org.xmlresolver.catalog.query",
+      "org.xmlresolver.exceptions",
+      "org.xmlresolver.loaders",
+      "org.xmlresolver.logging",
+      "org.xmlresolver.sources",
+      "org.xmlresolver.tools",
+      "org.xmlresolver.utils"
+    ],
     "org.yaml:snakeyaml": [
       "org.yaml.snakeyaml",
       "org.yaml.snakeyaml.composer",
@@ -5784,6 +6107,37 @@
       "org.yaml.snakeyaml.serializer",
       "org.yaml.snakeyaml.tokens",
       "org.yaml.snakeyaml.util"
+    ],
+    "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": {
@@ -5859,6 +6213,8 @@
       "com.github.spinalhdl:spinalhdl-core_2.11",
       "com.github.spinalhdl:spinalhdl-lib_2.11",
       "com.github.spinalhdl:spinalhdl-sim_2.11",
+      "com.github.spotbugs:spotbugs",
+      "com.github.spotbugs:spotbugs-annotations",
       "com.github.stephenc.jcip:jcip-annotations",
       "com.google.android.gms:play-services-base:aar",
       "com.google.android.gms:play-services-basement:aar",
@@ -5955,6 +6311,7 @@
       "javax.enterprise:cdi-api",
       "javax.inject:javax.inject",
       "javax.mail:mail",
+      "jaxen:jaxen",
       "jline:jline",
       "joda-time:joda-time",
       "junit:junit",
@@ -5963,9 +6320,11 @@
       "net.bytebuddy:byte-buddy-agent",
       "net.java.dev.jna:jna",
       "net.java.dev.jna:jna-platform",
+      "net.jcip:jcip-annotations",
       "net.minidev:json-smart",
       "net.openhft:affinity",
       "net.sf.jopt-simple:jopt-simple",
+      "net.sf.saxon:Saxon-HE",
       "net.sourceforge.f2j:arpack_combined_all",
       "nz.ac.waikato.cms.weka.thirdparty:bounce",
       "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b",
@@ -5975,10 +6334,12 @@
       "org.apache.ant:ant",
       "org.apache.ant:ant-launcher",
       "org.apache.avro:avro",
+      "org.apache.bcel:bcel",
       "org.apache.commons:commons-collections4",
       "org.apache.commons:commons-compress",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-math3",
+      "org.apache.commons:commons-text",
       "org.apache.curator:curator-test",
       "org.apache.flink:flink-annotations",
       "org.apache.flink:flink-clients_2.12",
@@ -6007,7 +6368,7 @@
       "org.apache.maven:maven-model",
       "org.apache.maven:maven-plugin-api",
       "org.apache.yetus:audience-annotations",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.bouncycastle:bcpkix-jdk15on",
       "org.bouncycastle:bcprov-ext-jdk15on",
       "org.bouncycastle:bcprov-jdk15on",
@@ -6018,6 +6379,7 @@
       "org.codehaus.plexus:plexus-classworlds",
       "org.codehaus.plexus:plexus-component-annotations",
       "org.codehaus.plexus:plexus-utils",
+      "org.dom4j:dom4j",
       "org.eclipse.jetty.orbit:javax.servlet",
       "org.eclipse.jetty:jetty-http:jar:tests",
       "org.eclipse.jetty:jetty-io",
@@ -6045,6 +6407,7 @@
       "org.ow2.asm:asm-analysis",
       "org.ow2.asm:asm-commons",
       "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util",
       "org.pantsbuild:jarjar",
       "org.projectnessie.cel:cel-core",
       "org.projectnessie.cel:cel-generated-antlr",
@@ -6059,7 +6422,10 @@
       "org.slf4j:slf4j-simple",
       "org.tukaani:xz",
       "org.xerial.snappy:snappy-java",
-      "org.yaml:snakeyaml"
+      "org.xmlresolver:xmlresolver",
+      "org.xmlresolver:xmlresolver:jar:data",
+      "org.yaml:snakeyaml",
+      "xml-apis:xml-apis"
     ],
     "https://maven.google.com/": [
       "android.arch.core:common",
@@ -6133,6 +6499,8 @@
       "com.github.spinalhdl:spinalhdl-core_2.11",
       "com.github.spinalhdl:spinalhdl-lib_2.11",
       "com.github.spinalhdl:spinalhdl-sim_2.11",
+      "com.github.spotbugs:spotbugs",
+      "com.github.spotbugs:spotbugs-annotations",
       "com.github.stephenc.jcip:jcip-annotations",
       "com.google.android.gms:play-services-base:aar",
       "com.google.android.gms:play-services-basement:aar",
@@ -6229,6 +6597,7 @@
       "javax.enterprise:cdi-api",
       "javax.inject:javax.inject",
       "javax.mail:mail",
+      "jaxen:jaxen",
       "jline:jline",
       "joda-time:joda-time",
       "junit:junit",
@@ -6237,9 +6606,11 @@
       "net.bytebuddy:byte-buddy-agent",
       "net.java.dev.jna:jna",
       "net.java.dev.jna:jna-platform",
+      "net.jcip:jcip-annotations",
       "net.minidev:json-smart",
       "net.openhft:affinity",
       "net.sf.jopt-simple:jopt-simple",
+      "net.sf.saxon:Saxon-HE",
       "net.sourceforge.f2j:arpack_combined_all",
       "nz.ac.waikato.cms.weka.thirdparty:bounce",
       "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b",
@@ -6249,10 +6620,12 @@
       "org.apache.ant:ant",
       "org.apache.ant:ant-launcher",
       "org.apache.avro:avro",
+      "org.apache.bcel:bcel",
       "org.apache.commons:commons-collections4",
       "org.apache.commons:commons-compress",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-math3",
+      "org.apache.commons:commons-text",
       "org.apache.curator:curator-test",
       "org.apache.flink:flink-annotations",
       "org.apache.flink:flink-clients_2.12",
@@ -6281,7 +6654,7 @@
       "org.apache.maven:maven-model",
       "org.apache.maven:maven-plugin-api",
       "org.apache.yetus:audience-annotations",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.bouncycastle:bcpkix-jdk15on",
       "org.bouncycastle:bcprov-ext-jdk15on",
       "org.bouncycastle:bcprov-jdk15on",
@@ -6292,6 +6665,7 @@
       "org.codehaus.plexus:plexus-classworlds",
       "org.codehaus.plexus:plexus-component-annotations",
       "org.codehaus.plexus:plexus-utils",
+      "org.dom4j:dom4j",
       "org.eclipse.jetty.orbit:javax.servlet",
       "org.eclipse.jetty:jetty-http:jar:tests",
       "org.eclipse.jetty:jetty-io",
@@ -6319,6 +6693,7 @@
       "org.ow2.asm:asm-analysis",
       "org.ow2.asm:asm-commons",
       "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util",
       "org.pantsbuild:jarjar",
       "org.projectnessie.cel:cel-core",
       "org.projectnessie.cel:cel-generated-antlr",
@@ -6333,7 +6708,10 @@
       "org.slf4j:slf4j-simple",
       "org.tukaani:xz",
       "org.xerial.snappy:snappy-java",
-      "org.yaml:snakeyaml"
+      "org.xmlresolver:xmlresolver",
+      "org.xmlresolver:xmlresolver:jar:data",
+      "org.yaml:snakeyaml",
+      "xml-apis:xml-apis"
     ],
     "https://packages.confluent.io/maven/": [
       "android.arch.core:common",
@@ -6407,6 +6785,8 @@
       "com.github.spinalhdl:spinalhdl-core_2.11",
       "com.github.spinalhdl:spinalhdl-lib_2.11",
       "com.github.spinalhdl:spinalhdl-sim_2.11",
+      "com.github.spotbugs:spotbugs",
+      "com.github.spotbugs:spotbugs-annotations",
       "com.github.stephenc.jcip:jcip-annotations",
       "com.google.android.gms:play-services-base:aar",
       "com.google.android.gms:play-services-basement:aar",
@@ -6503,6 +6883,7 @@
       "javax.enterprise:cdi-api",
       "javax.inject:javax.inject",
       "javax.mail:mail",
+      "jaxen:jaxen",
       "jline:jline",
       "joda-time:joda-time",
       "junit:junit",
@@ -6511,9 +6892,11 @@
       "net.bytebuddy:byte-buddy-agent",
       "net.java.dev.jna:jna",
       "net.java.dev.jna:jna-platform",
+      "net.jcip:jcip-annotations",
       "net.minidev:json-smart",
       "net.openhft:affinity",
       "net.sf.jopt-simple:jopt-simple",
+      "net.sf.saxon:Saxon-HE",
       "net.sourceforge.f2j:arpack_combined_all",
       "nz.ac.waikato.cms.weka.thirdparty:bounce",
       "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b",
@@ -6523,10 +6906,12 @@
       "org.apache.ant:ant",
       "org.apache.ant:ant-launcher",
       "org.apache.avro:avro",
+      "org.apache.bcel:bcel",
       "org.apache.commons:commons-collections4",
       "org.apache.commons:commons-compress",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-math3",
+      "org.apache.commons:commons-text",
       "org.apache.curator:curator-test",
       "org.apache.flink:flink-annotations",
       "org.apache.flink:flink-clients_2.12",
@@ -6555,7 +6940,7 @@
       "org.apache.maven:maven-model",
       "org.apache.maven:maven-plugin-api",
       "org.apache.yetus:audience-annotations",
-      "org.apache.zookeeper:zookeeper:pom",
+      "org.apache.zookeeper:zookeeper",
       "org.bouncycastle:bcpkix-jdk15on",
       "org.bouncycastle:bcprov-ext-jdk15on",
       "org.bouncycastle:bcprov-jdk15on",
@@ -6566,6 +6951,7 @@
       "org.codehaus.plexus:plexus-classworlds",
       "org.codehaus.plexus:plexus-component-annotations",
       "org.codehaus.plexus:plexus-utils",
+      "org.dom4j:dom4j",
       "org.eclipse.jetty.orbit:javax.servlet",
       "org.eclipse.jetty:jetty-http:jar:tests",
       "org.eclipse.jetty:jetty-io",
@@ -6593,6 +6979,7 @@
       "org.ow2.asm:asm-analysis",
       "org.ow2.asm:asm-commons",
       "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util",
       "org.pantsbuild:jarjar",
       "org.projectnessie.cel:cel-core",
       "org.projectnessie.cel:cel-generated-antlr",
@@ -6607,7 +6994,10 @@
       "org.slf4j:slf4j-simple",
       "org.tukaani:xz",
       "org.xerial.snappy:snappy-java",
-      "org.yaml:snakeyaml"
+      "org.xmlresolver:xmlresolver",
+      "org.xmlresolver:xmlresolver:jar:data",
+      "org.yaml:snakeyaml",
+      "xml-apis:xml-apis"
     ]
   },
   "services": {
@@ -6779,6 +7169,11 @@
         "io.sundr.resourcecify.internal.processor.ResourcecifyProcessor"
       ]
     },
+    "net.sf.saxon:Saxon-HE": {
+      "javax.xml.transform.TransformerFactory": [
+        "net.sf.saxon.TransformerFactoryImpl"
+      ]
+    },
     "org.apache.flink:flink-shaded-jackson": {
       "org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory": [
         "org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory",