diff --git a/pom.xml b/pom.xml index 44d9ac7113d27..45dfefd977c79 100644 --- a/pom.xml +++ b/pom.xml @@ -1189,6 +1189,13 @@ jline 2.14.6 + + software.amazon.awssdk + bom + ${aws.java.sdk.v2.version} + pom + import + org.scalatest scalatest_${scala.binary.version} diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d360bc3a87920..029b0992254b8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1189,12 +1189,16 @@ object DependencyOverrides { lazy val guavaVersion = sys.props.get("guava.version").getOrElse("33.4.0-jre") lazy val jacksonVersion = sys.props.get("fasterxml.jackson.version").getOrElse("2.20.0") lazy val jacksonDeps = Bom.dependencies("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion) - lazy val settings = jacksonDeps ++ Seq( + lazy val awsJavaSdkV2Version = sys.props.get("aws.java.sdk.v2.version").getOrElse("2.29.52") + lazy val awsJavaSdkV2Deps = + Bom.dependencies("software.amazon.awssdk" % "bom" % awsJavaSdkV2Version) + lazy val settings = jacksonDeps ++ awsJavaSdkV2Deps ++ Seq( dependencyOverrides += "com.google.guava" % "guava" % guavaVersion, dependencyOverrides ++= jacksonDeps.key.value, dependencyOverrides += "jline" % "jline" % "2.14.6", dependencyOverrides += "org.apache.avro" % "avro" % "1.12.1", - dependencyOverrides += "org.slf4j" % "slf4j-api" % "2.0.17") + dependencyOverrides += "org.slf4j" % "slf4j-api" % "2.0.17", + dependencyOverrides ++= awsJavaSdkV2Deps.key.value) } /**