From 46c5d4bd9d8387c28f05fff43b544621a3055028 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 20 Oct 2025 22:20:10 +0800 Subject: [PATCH 1/3] [SPARK-53958][BUILD] Simplify Jackson deps management by using BOM --- connector/kafka-0-10-sql/pom.xml | 12 ------- connector/kafka-0-10/pom.xml | 12 ------- connector/kinesis-asl/pom.xml | 7 ---- core/pom.xml | 12 ------- hadoop-cloud/pom.xml | 1 - pom.xml | 41 +++-------------------- project/SparkBuild.scala | 6 +++- project/plugins.sbt | 2 ++ resource-managers/kubernetes/core/pom.xml | 15 --------- 9 files changed, 11 insertions(+), 97 deletions(-) diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index 4ab99f792959..a5987ae703ad 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -104,18 +104,6 @@ ${kafka.version} test - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - commons-logging commons-logging diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index 62b0807e959d..e1d5e160e26c 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -80,18 +80,6 @@ ${kafka.version} test - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - commons-logging commons-logging diff --git a/connector/kinesis-asl/pom.xml b/connector/kinesis-asl/pom.xml index aa90e3c8a94f..0d0ad41ed3b0 100644 --- a/connector/kinesis-asl/pom.xml +++ b/connector/kinesis-asl/pom.xml @@ -75,13 +75,6 @@ - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${fasterxml.jackson.version} - org.mockito mockito-core diff --git a/core/pom.xml b/core/pom.xml index 79aa783cf209..1853399dccde 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -491,18 +491,6 @@ commons-logging commons-logging - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - com.amazonaws diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index dbdbe8846e18..dc6da9304a0e 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -146,7 +146,6 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - ${fasterxml.jackson.version} diff --git a/pom.xml b/pom.xml index a1dad1605c7b..720333c12c5b 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,6 @@ true true 2.19.2 - 2.19.2 2.3.1 1.1.10.8 3.0.4 @@ -1063,29 +1062,11 @@ ${codahale.metrics.version} - com.fasterxml.jackson.core - jackson-core - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.databind.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.module - jackson-module-scala_${scala.binary.version} + com.fasterxml.jackson + jackson-bom ${fasterxml.jackson.version} + import + pom org.apache.ws.xmlschema @@ -1164,12 +1145,6 @@ org.json4s json4s-jackson_${scala.binary.version} 4.0.7 - - - com.fasterxml.jackson.core - * - - org.scala-lang.modules @@ -2528,14 +2503,6 @@ arrow-vector ${arrow.version} - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - io.netty netty-common diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a57aae28a699..4806832de4b8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -31,6 +31,7 @@ import sbt.Classpaths.publishOrSkip import sbt.Keys._ import sbt.librarymanagement.{ VersionNumber, SemanticSelector } import com.etsy.sbt.checkstyle.CheckstylePlugin.autoImport._ +import com.here.bom.Bom import com.simplytyped.Antlr4Plugin._ import sbtpomreader.{PomBuild, SbtPomKeys} import com.typesafe.tools.mima.plugin.MimaKeys @@ -1096,8 +1097,11 @@ object KubernetesIntegrationTests { */ object DependencyOverrides { lazy val guavaVersion = sys.props.get("guava.version").getOrElse("33.4.0-jre") - lazy val settings = Seq( + lazy val jacksonVersion = sys.props.get("fasterxml.jackson.version").getOrElse("2.19.2") + lazy val jacksonDeps = Bom.dependencies("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion) + lazy val settings = jacksonDeps ++ Seq( dependencyOverrides += "com.google.guava" % "guava" % guavaVersion, + dependencyOverrides ++= jacksonDeps.key.value, dependencyOverrides += "jline" % "jline" % "2.14.6", dependencyOverrides += "org.apache.avro" % "avro" % "1.12.0") } diff --git a/project/plugins.sbt b/project/plugins.sbt index 262e41dd6193..d1f57b7fcfb8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -44,3 +44,5 @@ addSbtPlugin("com.github.sbt" % "sbt-pom-reader" % "2.5.0") addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.17.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") + +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.29") diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 972b618a5caa..f7518b95ef9a 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -110,14 +110,6 @@ kubernetes-client ${kubernetes-client.version} - - com.fasterxml.jackson.core - * - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - javax.annotation @@ -126,13 +118,6 @@ - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${fasterxml.jackson.version} - - com.google.guava From d15ff1c1513709aa7cf256ad93823aec11fe38c3 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 21 Oct 2025 10:22:44 +0800 Subject: [PATCH 2/3] revert exclusion --- connector/kafka-0-10-sql/pom.xml | 12 ++++++++++++ connector/kafka-0-10/pom.xml | 12 ++++++++++++ connector/kinesis-asl/pom.xml | 7 +++++++ core/pom.xml | 12 ++++++++++++ hadoop-cloud/pom.xml | 1 + resource-managers/kubernetes/core/pom.xml | 15 +++++++++++++++ 6 files changed, 59 insertions(+) diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index a5987ae703ad..4ab99f792959 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -104,6 +104,18 @@ ${kafka.version} test + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + commons-logging commons-logging diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index e1d5e160e26c..62b0807e959d 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -80,6 +80,18 @@ ${kafka.version} test + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + commons-logging commons-logging diff --git a/connector/kinesis-asl/pom.xml b/connector/kinesis-asl/pom.xml index 0d0ad41ed3b0..aa90e3c8a94f 100644 --- a/connector/kinesis-asl/pom.xml +++ b/connector/kinesis-asl/pom.xml @@ -75,6 +75,13 @@ + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${fasterxml.jackson.version} + org.mockito mockito-core diff --git a/core/pom.xml b/core/pom.xml index 1853399dccde..79aa783cf209 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -491,6 +491,18 @@ commons-logging commons-logging + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + com.amazonaws diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index dc6da9304a0e..dbdbe8846e18 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -146,6 +146,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor + ${fasterxml.jackson.version} diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index f7518b95ef9a..972b618a5caa 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -110,6 +110,14 @@ kubernetes-client ${kubernetes-client.version} + + com.fasterxml.jackson.core + * + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + javax.annotation @@ -118,6 +126,13 @@ + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${fasterxml.jackson.version} + + com.google.guava From c6fd77250546cb66cbfcef589779023e0359f92d Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 21 Oct 2025 10:28:31 +0800 Subject: [PATCH 3/3] revert --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 720333c12c5b..c54af00c23ef 100644 --- a/pom.xml +++ b/pom.xml @@ -1145,6 +1145,12 @@ org.json4s json4s-jackson_${scala.binary.version} 4.0.7 + + + com.fasterxml.jackson.core + * + + org.scala-lang.modules @@ -2503,6 +2509,14 @@ arrow-vector ${arrow.version} + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + io.netty netty-common