diff --git a/pom.xml b/pom.xml index a1dad1605c7b..c54af00c23ef 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 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")