diff --git a/flink/BUILD.bazel b/flink/BUILD.bazel
index 4a5a698c37..f68549ffbb 100644
--- a/flink/BUILD.bazel
+++ b/flink/BUILD.bazel
@@ -24,7 +24,10 @@ scala_library(
         maven_artifact("org.apache.avro:avro"),
         maven_artifact("io.confluent:kafka-schema-registry-client"),
         maven_artifact("io.confluent:kafka-protobuf-provider"),
+        maven_artifact("org.apache.hadoop:hadoop-common"),
         maven_artifact("org.apache.hadoop:hadoop-client-api"),
+        maven_artifact("org.apache.hadoop:hadoop-yarn-api"),
+        maven_artifact("org.eclipse.jetty:jetty-util"),
     ],
 )
 
@@ -47,6 +50,7 @@ test_deps = _FLINK_TEST_DEPS + [
     maven_artifact("io.confluent:kafka-protobuf-provider"),
     maven_artifact("org.apache.kafka:kafka-clients"),
     maven_artifact("com.google.protobuf:protobuf-java"),
+    maven_artifact("org.apache.hadoop:hadoop-common"),
     maven_artifact("org.apache.hadoop:hadoop-client-api"),
     # Testing
     scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
diff --git a/maven_install.json b/maven_install.json
index e1d56f6373..cf93222121 100755
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 408929165,
-  "__RESOLVED_ARTIFACTS_HASH": 215337072,
+  "__INPUT_ARTIFACTS_HASH": 999023780,
+  "__RESOLVED_ARTIFACTS_HASH": 490070983,
   "artifacts": {
     "ant:ant": {
       "shasums": {
@@ -234,6 +234,20 @@
       },
       "version": "2.17.2"
     },
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base": {
+      "shasums": {
+        "jar": "b91cdb52f41485aaf0d3518852bbdfcdb9e7033b12cc412eb7f35bd06c9f33d4",
+        "sources": "af5f37f6a7a8adaec9919f59d134807594fdf50925797faa842c5efb2f9de76a"
+      },
+      "version": "2.12.7"
+    },
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
+      "shasums": {
+        "jar": "ed6a6a17f423f53af100ff3b5be56e096727e9bc86517667f59496583cba85d5",
+        "sources": "1e419ad64ab17ce69cf42bf305494e326ec089803784b8245d232a5130b36eb4"
+      },
+      "version": "2.12.7"
+    },
     "com.fasterxml.jackson.module:jackson-module-afterburner": {
       "shasums": {
         "jar": "4b21f0f76a197de87b2e04c19a42c89ae84557983c8cc3a8b9f9411e659d73dd",
@@ -241,6 +255,13 @@
       },
       "version": "2.15.2"
     },
+    "com.fasterxml.jackson.module:jackson-module-jaxb-annotations": {
+      "shasums": {
+        "jar": "84686ef549abf053ee3632925b024be3f330bc6f34f7e166f0537799e7f90dbd",
+        "sources": "3c9de5264aff641a8cf5690b219032135823a52903182cb786c910bf9e4305a2"
+      },
+      "version": "2.12.7"
+    },
     "com.fasterxml.woodstox:woodstox-core": {
       "shasums": {
         "jar": "dbb958cb89f1d45238b061e146249494ff887f5f42b671a3956e98956e0d5c53",
@@ -881,10 +902,10 @@
     },
     "com.google.inject.extensions:guice-servlet": {
       "shasums": {
-        "jar": "9e72a4b8582888d53c2f4297e93276a3c14c82880124490f2da7b16a9df1c618",
-        "sources": "7dde1db4c54bf7d5a3183b466606309af59bbe43f3efda60af91e62c8f1a8556"
+        "jar": "57f16a367c5cd200c427591cce5de86146369fcdd90ea72e8296793927a4324d",
+        "sources": "e5d8ef95bf886972deaf705a53469b52442bb8269bfe10d4a4e5534fdcdfbb7e"
       },
-      "version": "3.0"
+      "version": "4.2.3"
     },
     "com.google.inject:guice": {
       "shasums": {
@@ -1000,17 +1021,17 @@
     },
     "com.sun.jersey.contribs:jersey-guice": {
       "shasums": {
-        "jar": "544fc92d2625332a9a8eeaa7a7274cf1af6703936a50afa80d92a78200a7de34",
-        "sources": "02b589fc0ce7b5cc956c17e0689992ccb48aa019c1a29a890f57d71e8b1fe13f"
+        "jar": "8653320f79f20a369bfb9e6ff84be9315843bc4a048b37e1df13c777c7cfcb33",
+        "sources": "d0d4083231c60f738a40a0bd9ce50ac3bb1a0263f131c37adb413cbb6e0d1d8d"
       },
-      "version": "1.9"
+      "version": "1.19.4"
     },
     "com.sun.jersey:jersey-client": {
       "shasums": {
-        "jar": "8ae03af0d06c46a51b65d123ec40f245da690991aa3669cef4767db8f36fbe68",
-        "sources": "a2a289dc3516fbeb9214b704f2afd595e25613408e9fbdc7fbd00391772b4619"
+        "jar": "639c825c5db580f8115bf49ffc893093526d2ed1079fbc929b6a5fbd0b2eda40",
+        "sources": "9631abce0f95276f98df223721776e2901d88af6a5cc9e7b6f7bd43dfe7eb5e6"
       },
-      "version": "1.9"
+      "version": "1.19.4"
     },
     "com.sun.jersey:jersey-core": {
       "shasums": {
@@ -1967,6 +1988,13 @@
       },
       "version": "2.0.2"
     },
+    "jakarta.xml.bind:jakarta.xml.bind-api": {
+      "shasums": {
+        "jar": "69156304079bdeed9fc0ae3b39389f19b3cc4ba4443bc80508995394ead742ea",
+        "sources": "61ceb3ed35ecf99f1803eac9c4b8f12103c7531952beae38ba53cc727f405532"
+      },
+      "version": "2.3.2"
+    },
     "javax.activation:activation": {
       "shasums": {
         "jar": "2881c79c9d6ef01c58e62beea13e9d1ac8b8baa16f2fc198ad6e6776defdcdd3",
@@ -2282,13 +2310,6 @@
       },
       "version": "3.6.1"
     },
-    "org.apache.commons:commons-text": {
-      "shasums": {
-        "jar": "2acf30a070b19163d5a480eae411a281341e870020e3534c6d5d4c8472739e30",
-        "sources": "6007de720fc51d7d110cdafe1419c9b1bc28c3e86b337bbae8f1860bf86cc609"
-      },
-      "version": "1.11.0"
-    },
     "org.apache.curator:apache-curator:pom": {
       "shasums": {
         "jar": "496d029209274a878d5b9a3a81b73879bd77ad50bc1b56874df17ae7a3ef9169",
@@ -2607,6 +2628,20 @@
       },
       "version": "2.10.0"
     },
+    "org.apache.hadoop:hadoop-yarn-api": {
+      "shasums": {
+        "jar": "f0943f95a4db9af48d0b077b498baf126b961a87524f1ab619b64cf8fe8337ac",
+        "sources": "066f44e098e7dd9b0cd600e999f8728a777e855aef1865a47c22139264700365"
+      },
+      "version": "3.4.1"
+    },
+    "org.apache.hadoop:hadoop-yarn-common": {
+      "shasums": {
+        "jar": "43d457e254fcd3dc00da09dc825624aa6383178a6a60adb4c4388e169088c1ee",
+        "sources": "f23c2b4035a6c078e687e252ea62714a5446faf798e521c9dfdab3aaad35de0c"
+      },
+      "version": "3.4.1"
+    },
     "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice": {
       "shasums": {
         "jar": "4685c8db44461d1d31f4f5328703cf5bade0445e3bd4d188a72ab5bf337ee8a6",
@@ -3365,10 +3400,10 @@
     },
     "org.eclipse.jetty:jetty-util": {
       "shasums": {
-        "jar": "d7998817d014f4e19a27d9f34fa2e70b1ef651b0f1ae11f8bf58ac294a725d08",
-        "sources": "3ad0fac5234ef18779103e90883e8d64c38e9b0a0bcbdabcfd5e4ea1bb17cd2c"
+        "jar": "a03d43c194993ebb4d51fbfe7fe29134d7863b28708380eeedd11797c83543cf",
+        "sources": "9d0cd186ed342a4e37d4ee6bc64ecb61793ff0d5cf8f95a1c0fbccd562dfb505"
       },
-      "version": "12.0.2"
+      "version": "12.0.16"
     },
     "org.eclipse.jetty:jetty-util-ajax": {
       "shasums": {
@@ -4027,8 +4062,6 @@
       "org.slf4j:slf4j-api"
     ],
     "co.cask.tephra:tephra-core": [
-      "ch.qos.logback:logback-classic",
-      "ch.qos.logback:logback-core",
       "co.cask.tephra:tephra-api",
       "com.google.code.gson:gson",
       "com.google.guava:guava",
@@ -4144,10 +4177,25 @@
       "com.fasterxml.jackson.core:jackson-core",
       "com.fasterxml.jackson.core:jackson-databind"
     ],
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base": [
+      "com.fasterxml.jackson.core:jackson-core",
+      "com.fasterxml.jackson.core:jackson-databind"
+    ],
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": [
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations"
+    ],
     "com.fasterxml.jackson.module:jackson-module-afterburner": [
       "com.fasterxml.jackson.core:jackson-core",
       "com.fasterxml.jackson.core:jackson-databind"
     ],
+    "com.fasterxml.jackson.module:jackson-module-jaxb-annotations": [
+      "com.fasterxml.jackson.core:jackson-annotations",
+      "com.fasterxml.jackson.core:jackson-core",
+      "com.fasterxml.jackson.core:jackson-databind",
+      "jakarta.activation:jakarta.activation-api",
+      "jakarta.xml.bind:jakarta.xml.bind-api"
+    ],
     "com.fasterxml.woodstox:woodstox-core": [
       "org.codehaus.woodstox:stax2-api"
     ],
@@ -5044,7 +5092,7 @@
     "com.sun.jersey.contribs:jersey-guice": [
       "com.google.inject.extensions:guice-servlet",
       "com.google.inject:guice",
-      "com.sun.jersey:jersey-server",
+      "com.sun.jersey:jersey-servlet",
       "javax.inject:javax.inject"
     ],
     "com.sun.jersey:jersey-client": [
@@ -5150,7 +5198,17 @@
       "org.slf4j:slf4j-api"
     ],
     "io.grpc:grpc-alts": [
-      "io.grpc:grpc-context"
+      "com.google.auth:google-auth-library-oauth2-http",
+      "com.google.guava:guava",
+      "com.google.protobuf:protobuf-java",
+      "io.grpc:grpc-auth",
+      "io.grpc:grpc-context",
+      "io.grpc:grpc-core",
+      "io.grpc:grpc-grpclb",
+      "io.grpc:grpc-netty-shaded",
+      "io.grpc:grpc-protobuf",
+      "io.grpc:grpc-stub",
+      "org.conscrypt:conscrypt-openjdk-uber"
     ],
     "io.grpc:grpc-api": [
       "com.google.code.findbugs:jsr305",
@@ -5602,6 +5660,9 @@
     "io.vertx:vertx-web-common": [
       "io.vertx:vertx-core"
     ],
+    "jakarta.xml.bind:jakarta.xml.bind-api": [
+      "jakarta.activation:jakarta.activation-api"
+    ],
     "javax.jdo:jdo-api": [
       "javax.transaction:jta"
     ],
@@ -5671,10 +5732,6 @@
     ],
     "org.apache.commons:commons-configuration2": [
       "commons-logging:commons-logging",
-      "org.apache.commons:commons-lang3",
-      "org.apache.commons:commons-text"
-    ],
-    "org.apache.commons:commons-text": [
       "org.apache.commons:commons-lang3"
     ],
     "org.apache.curator:apache-curator:pom": [
@@ -5734,7 +5791,6 @@
       "commons-collections:commons-collections",
       "org.apache.commons:commons-compress",
       "org.apache.commons:commons-lang3",
-      "org.apache.commons:commons-text",
       "org.apache.flink:flink-annotations",
       "org.apache.flink:flink-metrics-core",
       "org.apache.flink:flink-shaded-asm-9",
@@ -5748,7 +5804,6 @@
       "commons-collections:commons-collections",
       "org.apache.commons:commons-compress",
       "org.apache.commons:commons-lang3",
-      "org.apache.commons:commons-text",
       "org.apache.flink:flink-annotations",
       "org.apache.flink:flink-metrics-core",
       "org.apache.flink:flink-shaded-asm-9",
@@ -5821,7 +5876,6 @@
       "commons-cli:commons-cli",
       "commons-io:commons-io",
       "org.apache.commons:commons-lang3",
-      "org.apache.commons:commons-text",
       "org.apache.flink:flink-core",
       "org.apache.flink:flink-hadoop-fs",
       "org.apache.flink:flink-java",
@@ -5843,7 +5897,6 @@
       "commons-cli:commons-cli",
       "commons-io:commons-io",
       "org.apache.commons:commons-lang3",
-      "org.apache.commons:commons-text",
       "org.apache.flink:flink-core",
       "org.apache.flink:flink-hadoop-fs",
       "org.apache.flink:flink-java",
@@ -5919,6 +5972,7 @@
       "org.apache.flink:flink-clients",
       "org.apache.flink:flink-runtime",
       "org.apache.hadoop:hadoop-common",
+      "org.apache.hadoop:hadoop-yarn-common",
       "org.slf4j:slf4j-api"
     ],
     "org.apache.hadoop:hadoop-client-api": [
@@ -5955,7 +6009,6 @@
       "org.apache.commons:commons-configuration2",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-math3",
-      "org.apache.commons:commons-text",
       "org.apache.curator:curator-client",
       "org.apache.curator:curator-recipes",
       "org.apache.hadoop.thirdparty:hadoop-shaded-guava",
@@ -5973,6 +6026,36 @@
       "org.slf4j:slf4j-reload4j",
       "org.xerial.snappy:snappy-java"
     ],
+    "org.apache.hadoop:hadoop-yarn-api": [
+      "com.fasterxml.jackson.core:jackson-annotations",
+      "javax.xml.bind:jaxb-api",
+      "org.apache.hadoop.thirdparty:hadoop-shaded-guava",
+      "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25"
+    ],
+    "org.apache.hadoop:hadoop-yarn-common": [
+      "ch.qos.reload4j:reload4j",
+      "com.fasterxml.jackson.core:jackson-core",
+      "com.fasterxml.jackson.core:jackson-databind",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
+      "com.github.pjfanning:jersey-json",
+      "com.google.inject.extensions:guice-servlet",
+      "com.google.inject:guice",
+      "com.sun.jersey.contribs:jersey-guice",
+      "com.sun.jersey:jersey-client",
+      "com.sun.jersey:jersey-core",
+      "com.sun.jersey:jersey-server",
+      "commons-cli:commons-cli",
+      "commons-codec:commons-codec",
+      "commons-io:commons-io",
+      "javax.servlet:javax.servlet-api",
+      "javax.xml.bind:jaxb-api",
+      "org.apache.commons:commons-compress",
+      "org.apache.hadoop.thirdparty:hadoop-shaded-guava",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.eclipse.jetty:jetty-util",
+      "org.slf4j:slf4j-api"
+    ],
     "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice": [
       "com.google.guava:guava",
       "com.google.inject.extensions:guice-servlet",
@@ -5985,6 +6068,8 @@
       "commons-collections:commons-collections",
       "commons-logging:commons-logging",
       "javax.xml.bind:jaxb-api",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-common",
       "org.codehaus.jettison:jettison",
       "org.fusesource.leveldbjni:leveldbjni-all"
@@ -5993,6 +6078,8 @@
       "com.google.guava:guava",
       "com.google.protobuf:protobuf-java",
       "commons-logging:commons-logging",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-common",
       "org.fusesource.leveldbjni:leveldbjni-all"
     ],
     "org.apache.hadoop:hadoop-yarn-server-resourcemanager": [
@@ -6009,6 +6096,8 @@
       "commons-logging:commons-logging",
       "javax.xml.bind:jaxb-api",
       "log4j:log4j",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
       "org.apache.hadoop:hadoop-yarn-server-common",
       "org.apache.hadoop:hadoop-yarn-server-web-proxy",
@@ -6020,6 +6109,8 @@
     "org.apache.hadoop:hadoop-yarn-server-web-proxy": [
       "com.google.guava:guava",
       "commons-logging:commons-logging",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-common",
       "org.mortbay.jetty:jetty"
     ],
@@ -6049,7 +6140,6 @@
       "io.dropwizard.metrics:metrics-core",
       "org.apache.commons:commons-crypto",
       "org.apache.commons:commons-lang3",
-      "org.apache.hadoop:hadoop-common",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
       "org.apache.hbase.thirdparty:hbase-shaded-netty",
       "org.apache.hbase.thirdparty:hbase-shaded-protobuf",
@@ -6089,6 +6179,7 @@
     "org.apache.hbase:hbase-hadoop2-compat": [
       "javax.activation:javax.activation-api",
       "org.apache.commons:commons-lang3",
+      "org.apache.hadoop:hadoop-common",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
       "org.apache.hbase:hbase-common",
       "org.apache.hbase:hbase-hadoop-compat",
@@ -6100,7 +6191,6 @@
     "org.apache.hbase:hbase-http": [
       "javax.ws.rs:javax.ws.rs-api",
       "javax.xml.bind:jaxb-api",
-      "org.apache.hadoop:hadoop-common",
       "org.apache.hbase.thirdparty:hbase-shaded-jersey",
       "org.apache.hbase.thirdparty:hbase-shaded-jetty",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
@@ -6148,6 +6238,7 @@
     ],
     "org.apache.hbase:hbase-replication": [
       "org.apache.commons:commons-lang3",
+      "org.apache.hadoop:hadoop-common",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
       "org.apache.hbase.thirdparty:hbase-shaded-protobuf",
       "org.apache.hbase:hbase-client",
@@ -6168,8 +6259,6 @@
       "org.apache.commons:commons-crypto",
       "org.apache.commons:commons-lang3",
       "org.apache.commons:commons-math3",
-      "org.apache.hadoop:hadoop-common",
-      "org.apache.hadoop:hadoop-distcp",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
       "org.apache.hbase.thirdparty:hbase-shaded-netty",
       "org.apache.hbase.thirdparty:hbase-shaded-protobuf",
@@ -6194,7 +6283,6 @@
     ],
     "org.apache.hbase:hbase-zookeeper": [
       "org.apache.commons:commons-lang3",
-      "org.apache.hadoop:hadoop-common",
       "org.apache.hbase.thirdparty:hbase-shaded-miscellaneous",
       "org.apache.hbase.thirdparty:hbase-shaded-protobuf",
       "org.apache.hbase:hbase-client",
@@ -6395,7 +6483,6 @@
       "com.fasterxml.jackson.core:jackson-annotations",
       "com.fasterxml.jackson.core:jackson-databind",
       "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-      "com.fasterxml.jackson.module:jackson-module-afterburner",
       "com.github.ben-manes.caffeine:caffeine",
       "com.lmax:disruptor",
       "com.uber.m3:tally-core",
@@ -6522,8 +6609,6 @@
       "org.apache.twill:twill-zookeeper"
     ],
     "org.apache.twill:twill-zookeeper": [
-      "ch.qos.logback:logback-classic",
-      "ch.qos.logback:logback-core",
       "com.google.guava:guava",
       "org.apache.twill:twill-api",
       "org.apache.twill:twill-common",
@@ -7505,6 +7590,17 @@
       "com.fasterxml.jackson.datatype.jsr310.ser.key",
       "com.fasterxml.jackson.datatype.jsr310.util"
     ],
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base": [
+      "com.fasterxml.jackson.jaxrs.annotation",
+      "com.fasterxml.jackson.jaxrs.base",
+      "com.fasterxml.jackson.jaxrs.base.nocontent",
+      "com.fasterxml.jackson.jaxrs.cfg",
+      "com.fasterxml.jackson.jaxrs.util"
+    ],
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": [
+      "com.fasterxml.jackson.jaxrs.json",
+      "com.fasterxml.jackson.jaxrs.json.annotation"
+    ],
     "com.fasterxml.jackson.module:jackson-module-afterburner": [
       "com.fasterxml.jackson.module.afterburner",
       "com.fasterxml.jackson.module.afterburner.asm",
@@ -7513,6 +7609,11 @@
       "com.fasterxml.jackson.module.afterburner.ser",
       "com.fasterxml.jackson.module.afterburner.util"
     ],
+    "com.fasterxml.jackson.module:jackson-module-jaxb-annotations": [
+      "com.fasterxml.jackson.module.jaxb",
+      "com.fasterxml.jackson.module.jaxb.deser",
+      "com.fasterxml.jackson.module.jaxb.ser"
+    ],
     "com.fasterxml.woodstox:woodstox-core": [
       "com.ctc.wstx.api",
       "com.ctc.wstx.cfg",
@@ -9027,7 +9128,6 @@
       "com.sun.jersey.api.client.filter",
       "com.sun.jersey.client.impl",
       "com.sun.jersey.client.impl.async",
-      "com.sun.jersey.client.osgi",
       "com.sun.jersey.client.proxy",
       "com.sun.jersey.client.urlconnection",
       "com.sun.ws.rs.ext"
@@ -10268,6 +10368,14 @@
       "javax.validation.spi",
       "javax.validation.valueextraction"
     ],
+    "jakarta.xml.bind:jakarta.xml.bind-api": [
+      "javax.xml.bind",
+      "javax.xml.bind.annotation",
+      "javax.xml.bind.annotation.adapters",
+      "javax.xml.bind.attachment",
+      "javax.xml.bind.helpers",
+      "javax.xml.bind.util"
+    ],
     "javax.activation:activation": [
       "com.sun.activation.registries",
       "com.sun.activation.viewers",
@@ -10828,16 +10936,6 @@
       "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.numbers",
-      "org.apache.commons.text.similarity",
-      "org.apache.commons.text.translate"
-    ],
     "org.apache.curator:curator-client": [
       "org.apache.curator",
       "org.apache.curator.connection",
@@ -12568,6 +12666,77 @@
       "org.apache.hadoop.tools.mapred.lib",
       "org.apache.hadoop.tools.util"
     ],
+    "org.apache.hadoop:hadoop-yarn-api": [
+      "org.apache.hadoop.yarn.ams",
+      "org.apache.hadoop.yarn.api",
+      "org.apache.hadoop.yarn.api.protocolrecords",
+      "org.apache.hadoop.yarn.api.records",
+      "org.apache.hadoop.yarn.api.records.impl",
+      "org.apache.hadoop.yarn.api.records.timeline",
+      "org.apache.hadoop.yarn.api.records.timelineservice",
+      "org.apache.hadoop.yarn.api.resource",
+      "org.apache.hadoop.yarn.conf",
+      "org.apache.hadoop.yarn.exceptions",
+      "org.apache.hadoop.yarn.factories",
+      "org.apache.hadoop.yarn.factory.providers",
+      "org.apache.hadoop.yarn.proto",
+      "org.apache.hadoop.yarn.server.api",
+      "org.apache.hadoop.yarn.server.api.protocolrecords",
+      "org.apache.hadoop.yarn.util",
+      "org.apache.hadoop.yarn.util.constraint",
+      "org.apache.hadoop.yarn.util.csi",
+      "org.apache.hadoop.yarn.util.resource"
+    ],
+    "org.apache.hadoop:hadoop-yarn-common": [
+      "org.apache.hadoop.yarn",
+      "org.apache.hadoop.yarn.api",
+      "org.apache.hadoop.yarn.api.impl.pb.client",
+      "org.apache.hadoop.yarn.api.impl.pb.service",
+      "org.apache.hadoop.yarn.api.pb",
+      "org.apache.hadoop.yarn.api.protocolrecords.impl.pb",
+      "org.apache.hadoop.yarn.api.records.impl.pb",
+      "org.apache.hadoop.yarn.api.resource",
+      "org.apache.hadoop.yarn.client",
+      "org.apache.hadoop.yarn.client.api",
+      "org.apache.hadoop.yarn.client.api.impl",
+      "org.apache.hadoop.yarn.event",
+      "org.apache.hadoop.yarn.factories",
+      "org.apache.hadoop.yarn.factories.impl.pb",
+      "org.apache.hadoop.yarn.factory.providers",
+      "org.apache.hadoop.yarn.ipc",
+      "org.apache.hadoop.yarn.logaggregation",
+      "org.apache.hadoop.yarn.logaggregation.filecontroller",
+      "org.apache.hadoop.yarn.logaggregation.filecontroller.ifile",
+      "org.apache.hadoop.yarn.logaggregation.filecontroller.tfile",
+      "org.apache.hadoop.yarn.metrics",
+      "org.apache.hadoop.yarn.nodelabels",
+      "org.apache.hadoop.yarn.nodelabels.event",
+      "org.apache.hadoop.yarn.nodelabels.store",
+      "org.apache.hadoop.yarn.nodelabels.store.op",
+      "org.apache.hadoop.yarn.proto",
+      "org.apache.hadoop.yarn.security",
+      "org.apache.hadoop.yarn.security.admin",
+      "org.apache.hadoop.yarn.security.client",
+      "org.apache.hadoop.yarn.security.client.impl.pb",
+      "org.apache.hadoop.yarn.server.api",
+      "org.apache.hadoop.yarn.server.api.impl.pb.client",
+      "org.apache.hadoop.yarn.server.api.impl.pb.service",
+      "org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb",
+      "org.apache.hadoop.yarn.server.metrics",
+      "org.apache.hadoop.yarn.server.security",
+      "org.apache.hadoop.yarn.sharedcache",
+      "org.apache.hadoop.yarn.state",
+      "org.apache.hadoop.yarn.util",
+      "org.apache.hadoop.yarn.util.resource",
+      "org.apache.hadoop.yarn.util.timeline",
+      "org.apache.hadoop.yarn.webapp",
+      "org.apache.hadoop.yarn.webapp.dao",
+      "org.apache.hadoop.yarn.webapp.example",
+      "org.apache.hadoop.yarn.webapp.hamlet2",
+      "org.apache.hadoop.yarn.webapp.log",
+      "org.apache.hadoop.yarn.webapp.util",
+      "org.apache.hadoop.yarn.webapp.view"
+    ],
     "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice": [
       "org.apache.hadoop.yarn.proto",
       "org.apache.hadoop.yarn.server.applicationhistoryservice",
@@ -16624,6 +16793,7 @@
       "org.eclipse.jetty.util.annotation",
       "org.eclipse.jetty.util.component",
       "org.eclipse.jetty.util.compression",
+      "org.eclipse.jetty.util.jndi",
       "org.eclipse.jetty.util.preventers",
       "org.eclipse.jetty.util.resource",
       "org.eclipse.jetty.util.security",
@@ -17953,8 +18123,14 @@
       "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:sources",
       "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
       "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:sources",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:sources",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:sources",
       "com.fasterxml.jackson.module:jackson-module-afterburner",
       "com.fasterxml.jackson.module:jackson-module-afterburner:jar:sources",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:sources",
       "com.fasterxml.woodstox:woodstox-core",
       "com.fasterxml.woodstox:woodstox-core:jar:sources",
       "com.github.ben-manes.caffeine:caffeine",
@@ -18453,6 +18629,8 @@
       "jakarta.transaction:jakarta.transaction-api:jar:sources",
       "jakarta.validation:jakarta.validation-api",
       "jakarta.validation:jakarta.validation-api:jar:sources",
+      "jakarta.xml.bind:jakarta.xml.bind-api",
+      "jakarta.xml.bind:jakarta.xml.bind-api:jar:sources",
       "javax.activation:activation",
       "javax.activation:activation:jar:sources",
       "javax.activation:javax.activation-api",
@@ -18542,8 +18720,6 @@
       "org.apache.commons:commons-lang3:jar:sources",
       "org.apache.commons:commons-math3",
       "org.apache.commons:commons-math3:jar:sources",
-      "org.apache.commons:commons-text",
-      "org.apache.commons:commons-text:jar:sources",
       "org.apache.curator:apache-curator:pom",
       "org.apache.curator:curator-client",
       "org.apache.curator:curator-client:jar:sources",
@@ -18626,6 +18802,10 @@
       "org.apache.hadoop:hadoop-common:jar:sources",
       "org.apache.hadoop:hadoop-distcp",
       "org.apache.hadoop:hadoop-distcp:jar:sources",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-api:jar:sources",
+      "org.apache.hadoop:hadoop-yarn-common",
+      "org.apache.hadoop:hadoop-yarn-common:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-common",
@@ -19084,8 +19264,14 @@
       "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:sources",
       "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
       "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:sources",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:sources",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
+      "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:sources",
       "com.fasterxml.jackson.module:jackson-module-afterburner",
       "com.fasterxml.jackson.module:jackson-module-afterburner:jar:sources",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
+      "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:sources",
       "com.fasterxml.woodstox:woodstox-core",
       "com.fasterxml.woodstox:woodstox-core:jar:sources",
       "com.github.ben-manes.caffeine:caffeine",
@@ -19584,6 +19770,8 @@
       "jakarta.transaction:jakarta.transaction-api:jar:sources",
       "jakarta.validation:jakarta.validation-api",
       "jakarta.validation:jakarta.validation-api:jar:sources",
+      "jakarta.xml.bind:jakarta.xml.bind-api",
+      "jakarta.xml.bind:jakarta.xml.bind-api:jar:sources",
       "javax.activation:activation",
       "javax.activation:activation:jar:sources",
       "javax.activation:javax.activation-api",
@@ -19673,8 +19861,6 @@
       "org.apache.commons:commons-lang3:jar:sources",
       "org.apache.commons:commons-math3",
       "org.apache.commons:commons-math3:jar:sources",
-      "org.apache.commons:commons-text",
-      "org.apache.commons:commons-text:jar:sources",
       "org.apache.curator:apache-curator:pom",
       "org.apache.curator:curator-client",
       "org.apache.curator:curator-client:jar:sources",
@@ -19757,6 +19943,10 @@
       "org.apache.hadoop:hadoop-common:jar:sources",
       "org.apache.hadoop:hadoop-distcp",
       "org.apache.hadoop:hadoop-distcp:jar:sources",
+      "org.apache.hadoop:hadoop-yarn-api",
+      "org.apache.hadoop:hadoop-yarn-api:jar:sources",
+      "org.apache.hadoop:hadoop-yarn-common",
+      "org.apache.hadoop:hadoop-yarn-common:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-common",
@@ -20213,6 +20403,22 @@
         "com.fasterxml.jackson.datatype.jsr310.JavaTimeModule"
       ]
     },
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
+      "javax.ws.rs.ext.MessageBodyReader": [
+        "com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"
+      ],
+      "javax.ws.rs.ext.MessageBodyWriter": [
+        "com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"
+      ]
+    },
+    "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:sources": {
+      "javax.ws.rs.ext.MessageBodyReader": [
+        "com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"
+      ],
+      "javax.ws.rs.ext.MessageBodyWriter": [
+        "com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"
+      ]
+    },
     "com.fasterxml.jackson.module:jackson-module-afterburner": {
       "com.fasterxml.jackson.databind.Module": [
         "com.fasterxml.jackson.module.afterburner.AfterburnerModule"
@@ -20223,6 +20429,16 @@
         "com.fasterxml.jackson.module.afterburner.AfterburnerModule"
       ]
     },
+    "com.fasterxml.jackson.module:jackson-module-jaxb-annotations": {
+      "com.fasterxml.jackson.databind.Module": [
+        "com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule"
+      ]
+    },
+    "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:sources": {
+      "com.fasterxml.jackson.databind.Module": [
+        "com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule"
+      ]
+    },
     "com.fasterxml.woodstox:woodstox-core": {
       "javax.xml.stream.XMLEventFactory": [
         "com.ctc.wstx.stax.WstxEventFactory"
@@ -22299,6 +22515,54 @@
         "org.apache.hadoop.crypto.key.kms.KMSClientProvider$KMSTokenRenewer"
       ]
     },
+    "org.apache.hadoop:hadoop-yarn-common": {
+      "org.apache.hadoop.security.SecurityInfo": [
+        "org.apache.hadoop.yarn.security.ContainerManagerSecurityInfo",
+        "org.apache.hadoop.yarn.security.SchedulerSecurityInfo",
+        "org.apache.hadoop.yarn.security.admin.AdminSecurityInfo",
+        "org.apache.hadoop.yarn.security.client.ClientRMSecurityInfo",
+        "org.apache.hadoop.yarn.security.client.ClientTimelineSecurityInfo"
+      ],
+      "org.apache.hadoop.security.token.TokenIdentifier": [
+        "org.apache.hadoop.yarn.security.AMRMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.ContainerTokenIdentifier",
+        "org.apache.hadoop.yarn.security.DockerCredentialTokenIdentifier",
+        "org.apache.hadoop.yarn.security.NMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.ClientToAMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier"
+      ],
+      "org.apache.hadoop.security.token.TokenRenewer": [
+        "org.apache.hadoop.yarn.security.AMRMTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.ContainerTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier$Renewer"
+      ]
+    },
+    "org.apache.hadoop:hadoop-yarn-common:jar:sources": {
+      "org.apache.hadoop.security.SecurityInfo": [
+        "org.apache.hadoop.yarn.security.ContainerManagerSecurityInfo",
+        "org.apache.hadoop.yarn.security.SchedulerSecurityInfo",
+        "org.apache.hadoop.yarn.security.admin.AdminSecurityInfo",
+        "org.apache.hadoop.yarn.security.client.ClientRMSecurityInfo",
+        "org.apache.hadoop.yarn.security.client.ClientTimelineSecurityInfo"
+      ],
+      "org.apache.hadoop.security.token.TokenIdentifier": [
+        "org.apache.hadoop.yarn.security.AMRMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.ContainerTokenIdentifier",
+        "org.apache.hadoop.yarn.security.DockerCredentialTokenIdentifier",
+        "org.apache.hadoop.yarn.security.NMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.ClientToAMTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier",
+        "org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier"
+      ],
+      "org.apache.hadoop.security.token.TokenRenewer": [
+        "org.apache.hadoop.yarn.security.AMRMTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.ContainerTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier$Renewer",
+        "org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier$Renewer"
+      ]
+    },
     "org.apache.hadoop:hadoop-yarn-server-common": {
       "org.apache.hadoop.security.SecurityInfo": [
         "org.apache.hadoop.yarn.server.RMNMSecurityInfoClass"
diff --git a/spark_install.json b/spark_install.json
index a0f6e0851d..e2bcd27e85 100755
--- a/spark_install.json
+++ b/spark_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -146534683,
-  "__RESOLVED_ARTIFACTS_HASH": 1749818990,
+  "__INPUT_ARTIFACTS_HASH": 741544640,
+  "__RESOLVED_ARTIFACTS_HASH": -1952005217,
   "artifacts": {
     "ant:ant": {
       "shasums": {
@@ -991,13 +991,6 @@
       },
       "version": "3.3.4"
     },
-    "org.apache.hadoop:hadoop-yarn-api": {
-      "shasums": {
-        "jar": "d78836fb4d18b2f71561c03898f4af70c6b4e4d100142c6998c4d7ff0af75be8",
-        "sources": "b6607aab1b9d57dee9cf94c6b5d18d9b6af916822be79b98b421bb7b7eff47ca"
-      },
-      "version": "2.7.2"
-    },
     "org.apache.hadoop:hadoop-yarn-common": {
       "shasums": {
         "jar": "dccbb23bd113f8cf5a66a3624409505c94621da4e5e34a68fd6af2a49277b544",
@@ -2014,7 +2007,8 @@
       "com.thoughtworks.paranamer:paranamer"
     ],
     "com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter": [
-      "io.dropwizard.metrics:metrics-core"
+      "io.dropwizard.metrics:metrics-core",
+      "org.slf4j:slf4j-api"
     ],
     "com.google.crypto.tink:tink": [
       "com.google.code.findbugs:jsr305",
@@ -2102,26 +2096,13 @@
     "io.netty:netty-all": [
       "io.netty:netty-buffer",
       "io.netty:netty-codec",
-      "io.netty:netty-codec-dns",
-      "io.netty:netty-codec-haproxy",
       "io.netty:netty-codec-http",
       "io.netty:netty-codec-http2",
-      "io.netty:netty-codec-memcache",
-      "io.netty:netty-codec-mqtt",
-      "io.netty:netty-codec-redis",
-      "io.netty:netty-codec-smtp",
       "io.netty:netty-codec-socks",
-      "io.netty:netty-codec-stomp",
-      "io.netty:netty-codec-xml",
       "io.netty:netty-common",
       "io.netty:netty-handler",
       "io.netty:netty-handler-proxy",
-      "io.netty:netty-handler-ssl-ocsp",
       "io.netty:netty-resolver",
-      "io.netty:netty-resolver-dns",
-      "io.netty:netty-resolver-dns-classes-macos",
-      "io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64",
-      "io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64",
       "io.netty:netty-transport",
       "io.netty:netty-transport-classes-epoll",
       "io.netty:netty-transport-classes-kqueue",
@@ -2129,10 +2110,7 @@
       "io.netty:netty-transport-native-epoll:jar:linux-x86_64",
       "io.netty:netty-transport-native-kqueue:jar:osx-aarch_64",
       "io.netty:netty-transport-native-kqueue:jar:osx-x86_64",
-      "io.netty:netty-transport-native-unix-common",
-      "io.netty:netty-transport-rxtx",
-      "io.netty:netty-transport-sctp",
-      "io.netty:netty-transport-udt"
+      "io.netty:netty-transport-native-unix-common"
     ],
     "io.netty:netty-buffer": [
       "io.netty:netty-common"
@@ -2308,11 +2286,6 @@
       "org.slf4j:slf4j-api",
       "org.xerial.snappy:snappy-java"
     ],
-    "org.apache.hadoop:hadoop-yarn-api": [
-      "commons-lang:commons-lang",
-      "commons-logging:commons-logging",
-      "org.apache.hadoop:hadoop-annotations"
-    ],
     "org.apache.hadoop:hadoop-yarn-common": [
       "com.google.inject.extensions:guice-servlet",
       "com.google.inject:guice",
@@ -2329,7 +2302,6 @@
       "log4j:log4j",
       "org.apache.commons:commons-compress",
       "org.apache.hadoop:hadoop-annotations",
-      "org.apache.hadoop:hadoop-yarn-api",
       "org.codehaus.jackson:jackson-core-asl",
       "org.codehaus.jackson:jackson-jaxrs",
       "org.codehaus.jackson:jackson-mapper-asl",
@@ -2348,7 +2320,6 @@
       "commons-logging:commons-logging",
       "javax.xml.bind:jaxb-api",
       "org.apache.hadoop:hadoop-annotations",
-      "org.apache.hadoop:hadoop-yarn-api",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-common",
       "org.codehaus.jettison:jettison",
@@ -2357,7 +2328,6 @@
     "org.apache.hadoop:hadoop-yarn-server-common": [
       "commons-logging:commons-logging",
       "org.apache.hadoop:hadoop-annotations",
-      "org.apache.hadoop:hadoop-yarn-api",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.fusesource.leveldbjni:leveldbjni-all"
     ],
@@ -2374,7 +2344,6 @@
       "javax.xml.bind:jaxb-api",
       "log4j:log4j",
       "org.apache.hadoop:hadoop-annotations",
-      "org.apache.hadoop:hadoop-yarn-api",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
       "org.apache.hadoop:hadoop-yarn-server-common",
@@ -2386,7 +2355,6 @@
     ],
     "org.apache.hadoop:hadoop-yarn-server-web-proxy": [
       "commons-logging:commons-logging",
-      "org.apache.hadoop:hadoop-yarn-api",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-server-common",
       "org.mortbay.jetty:jetty"
@@ -2444,7 +2412,8 @@
       "commons-lang:commons-lang"
     ],
     "org.apache.hive.shims:hive-shims-scheduler": [
-      "org.apache.hive.shims:hive-shims-common"
+      "org.apache.hive.shims:hive-shims-common",
+      "org.slf4j:slf4j-api"
     ],
     "org.apache.hive:hive-common": [
       "com.fasterxml.jackson.core:jackson-databind",
@@ -2456,8 +2425,17 @@
       "io.dropwizard.metrics:metrics-jvm",
       "jline:jline",
       "joda-time:joda-time",
+      "org.apache.ant:ant",
       "org.apache.commons:commons-compress",
-      "org.apache.commons:commons-lang3"
+      "org.apache.commons:commons-lang3",
+      "org.apache.hive:hive-shims",
+      "org.apache.hive:hive-storage-api",
+      "org.apache.logging.log4j:log4j-1.2-api",
+      "org.apache.logging.log4j:log4j-slf4j-impl",
+      "org.apache.logging.log4j:log4j-web",
+      "org.eclipse.jetty.aggregate:jetty-all",
+      "org.eclipse.jetty.orbit:javax.servlet",
+      "org.slf4j:slf4j-api"
     ],
     "org.apache.hive:hive-exec:jar:core": [
       "com.google.code.gson:gson",
@@ -2500,17 +2478,8 @@
       "org.slf4j:slf4j-api"
     ],
     "org.apache.hive:hive-serde": [
-      "com.google.code.findbugs:jsr305",
-      "commons-codec:commons-codec",
       "commons-lang:commons-lang",
-      "net.sf.opencsv:opencsv",
-      "org.apache.avro:avro",
-      "org.apache.hive:hive-common",
-      "org.apache.hive:hive-service-rpc",
-      "org.apache.hive:hive-shims",
-      "org.apache.parquet:parquet-hadoop-bundle",
-      "org.apache.thrift:libthrift",
-      "org.slf4j:slf4j-api"
+      "net.sf.opencsv:opencsv"
     ],
     "org.apache.hive:hive-service-rpc": [
       "commons-codec:commons-codec",
@@ -2523,7 +2492,8 @@
     "org.apache.hive:hive-shims": [
       "org.apache.hive.shims:hive-shims-0.23",
       "org.apache.hive.shims:hive-shims-common",
-      "org.apache.hive.shims:hive-shims-scheduler"
+      "org.apache.hive.shims:hive-shims-scheduler",
+      "org.slf4j:slf4j-api"
     ],
     "org.apache.hive:hive-storage-api": [
       "org.slf4j:slf4j-api"
@@ -2942,7 +2912,8 @@
     ],
     "org.apache.thrift:libthrift": [
       "org.apache.httpcomponents:httpclient",
-      "org.apache.httpcomponents:httpcore"
+      "org.apache.httpcomponents:httpcore",
+      "org.slf4j:slf4j-api"
     ],
     "org.apache.twill:twill-api": [
       "org.apache.twill:twill-common",
@@ -5236,20 +5207,6 @@
       "org.apache.hadoop.thirdparty.protobuf",
       "org.apache.hadoop.thirdparty.protobuf.compiler"
     ],
-    "org.apache.hadoop:hadoop-yarn-api": [
-      "org.apache.hadoop.yarn.api",
-      "org.apache.hadoop.yarn.api.protocolrecords",
-      "org.apache.hadoop.yarn.api.records",
-      "org.apache.hadoop.yarn.api.records.timeline",
-      "org.apache.hadoop.yarn.conf",
-      "org.apache.hadoop.yarn.exceptions",
-      "org.apache.hadoop.yarn.factories",
-      "org.apache.hadoop.yarn.factory.providers",
-      "org.apache.hadoop.yarn.proto",
-      "org.apache.hadoop.yarn.server.api",
-      "org.apache.hadoop.yarn.server.api.protocolrecords",
-      "org.apache.hadoop.yarn.util"
-    ],
     "org.apache.hadoop:hadoop-yarn-common": [
       "org.apache.hadoop.yarn",
       "org.apache.hadoop.yarn.api",
@@ -7775,8 +7732,6 @@
       "org.apache.hadoop:hadoop-annotations",
       "org.apache.hadoop:hadoop-annotations:jar:sources",
       "org.apache.hadoop:hadoop-client-runtime",
-      "org.apache.hadoop:hadoop-yarn-api",
-      "org.apache.hadoop:hadoop-yarn-api:jar:sources",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-common:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
@@ -8324,8 +8279,6 @@
       "org.apache.hadoop:hadoop-annotations",
       "org.apache.hadoop:hadoop-annotations:jar:sources",
       "org.apache.hadoop:hadoop-client-runtime",
-      "org.apache.hadoop:hadoop-yarn-api",
-      "org.apache.hadoop:hadoop-yarn-api:jar:sources",
       "org.apache.hadoop:hadoop-yarn-common",
       "org.apache.hadoop:hadoop-yarn-common:jar:sources",
       "org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice",
diff --git a/tools/build_rules/dependencies/maven_repository.bzl b/tools/build_rules/dependencies/maven_repository.bzl
index 2c409e21cd..ae9d576eb8 100644
--- a/tools/build_rules/dependencies/maven_repository.bzl
+++ b/tools/build_rules/dependencies/maven_repository.bzl
@@ -17,6 +17,8 @@ maven_repository = repository(
         "org.mockito:mockito-core:5.12.0",
         "org.objenesis:objenesis:3.4",
 
+        "org.eclipse.jetty:jetty-util:12.0.16",
+
         # Add other dependencies
         "org.slf4j:slf4j-api:2.0.12",
         "org.apache.logging.log4j:log4j-slf4j-impl:2.20.0",
@@ -70,6 +72,9 @@ maven_repository = repository(
         # Hadoop
         "org.apache.hadoop:hadoop-client-api:3.4.1",
         "org.apache.hadoop:hadoop-common:3.4.1",
+        "org.apache.hadoop:hadoop-yarn-api:3.4.1",
+        "org.apache.hadoop:hadoop-yarn-common:3.4.1",
+
 
         # AWS
         "software.amazon.awssdk:dynamodb:2.30.13",
@@ -118,6 +123,7 @@ maven_repository = repository(
         "io.vertx:vertx-unit:4.5.10",
     ],
     excluded_artifacts = [
+        "org.apache.commons:commons-text",
         "org.apache.beam:beam-sdks-java-io-hadoop-common",
         "org.pentaho:pentaho-aggdesigner-algorithm",
         # Exclude Hadoop from the assembled JAR
@@ -130,9 +136,7 @@ maven_repository = repository(
         "org.apache.hadoop:hadoop-hdfs-client",
         "org.apache.hadoop:hadoop-hdfs",
         "org.apache.hadoop:hadoop-mapreduce-client-core",
-        "org.apache.hadoop:hadoop-yarn-api",
         "org.apache.hadoop:hadoop-yarn-client",
-        "org.apache.hadoop:hadoop-yarn-common",
         "org.apache.parquet:parquet-avro",
         "org.apache.zookeeper:zookeeper",
         "org.scala-lang:scala-library",
diff --git a/tools/build_rules/dependencies/spark_repository.bzl b/tools/build_rules/dependencies/spark_repository.bzl
index caf71c6e5b..318e653ab4 100644
--- a/tools/build_rules/dependencies/spark_repository.bzl
+++ b/tools/build_rules/dependencies/spark_repository.bzl
@@ -39,6 +39,7 @@ spark_repository = repository(
         "org.apache.hadoop:hadoop-auth",
         "org.apache.hadoop:hadoop-client-api",
         "org.apache.hadoop:hadoop-common",
+        "org.apache.hadoop:hadoop-yarn-api",
         "org.apache.twill:twill-zookeeper",
         "org.apache.zookeeper:zookeeper",
         "com.google.guava:guava",