Change to Spark 3.2.1, hadoop 3.3.1, still gdal 3.8.3 (warp-bindings …

…3.8.0) This fits with Data Mechanics image gcr.io/datamechanics/spark:3.2.1-hadoop-3.3.1-java-11-scala-2.12-python-3.8-dm18
wri · Jul 9, 2024 · 329170a · 329170a
1 parent 95e9402
commit 329170a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 44 deletions.
diff --git a/build.sbt b/build.sbt
@@ -85,13 +85,6 @@ libraryDependencies ++= Seq(
 
 dependencyOverrides += "com.google.guava" % "guava" % "20.0"
 
-// This avoid a run-time warning (but with "error" markings) about multiple SLF4J
-// bindings, because of inclusion of both log4j-slf4j-impl-2.17.2 and
-// slf4j-log4j12-1.7.25.  Spark prefers to use log4j-slf4j-impl.
-excludeDependencies ++= Seq(
-  ExclusionRule("org.slf4j", "slf4j-log4j12")
-)
-
 assembly / assemblyShadeRules := {
   val shadePackage = "org.globalforestwatch.shaded"
   Seq(

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -21,9 +21,9 @@ object Version {
   val decline = "1.3.0"
   val scala = "2.12.12"
   val geotrellis = "3.7.0"
-  val hadoop = "3.2.1"
+  val hadoop = "3.3.1"
   val jackson = "2.10.0"
-  val spark = "3.3.2"
+  val spark = "3.2.1"
   val sparkCompatible = "3.0"
   val geotools = "24.1"
   val sedona = "1.2.0-incubating"

diff --git a/src/main/resources/log4j2.properties → src/main/resources/log4j.properties b/src/main/resources/log4j2.properties → src/main/resources/log4j.properties
diff --git a/src/main/scala/org/globalforestwatch/util/RequestPayerS3ClientFactory.scala b/src/main/scala/org/globalforestwatch/util/RequestPayerS3ClientFactory.scala
diff --git a/src/test/resources/log4j2.properties → src/test/resources/log4j.properties b/src/test/resources/log4j2.properties → src/test/resources/log4j.properties