Skip to content

Commit

Permalink
AWS SDK version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin committed Jul 13, 2022
1 parent a2df43f commit 581d1cd
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
7 changes: 1 addition & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ object Dependencies {
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0"
val apacheMath = "org.apache.commons" % "commons-math3" % "3.6.1"
val chronoscala = "jp.ne.opt" %% "chronoscala" % "1.0.0"
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.17.228"
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.17.230"
val hadoopClient = "org.apache.hadoop" % "hadoop-client" % Version.hadoop
val avro = "org.apache.avro" % "avro" % "1.10.2" // aligned with the Spark version
val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1"
Expand Down Expand Up @@ -135,11 +135,6 @@ object Dependencies {
val gdalBindings = "org.gdal" % "gdal" % Version.gdal
val gdalWarp = "com.azavea.geotrellis" % "gdal-warp-bindings" % Version.gdalWarp

val jacksonCore = "com.fasterxml.jackson.core" % "jackson-core" % "2.6.7"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.7"
val jacksonAnnotations = "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.7"
val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.7"

val shapeless = "com.chuusai" %% "shapeless" % "2.3.9"

// aligned with the GeoTools version
Expand Down
13 changes: 0 additions & 13 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -427,19 +427,6 @@ object Settings {
awsSdkS3 excludeAll ExclusionRule("com.fasterxml.jackson.core"),
scalatest % Test
),
/** https://github.com/lucidworks/spark-solr/issues/179 */
libraryDependencies ++= {
val deps = Seq(
jacksonCore,
jacksonDatabind,
jacksonAnnotations
)
CrossVersion.partialVersion(scalaVersion.value) match {
// if Scala 2.12+ is used
case Some((2, scalaMajor)) if scalaMajor >= 12 => deps
case _ => deps :+ jacksonModuleScala
}
},
mimaPreviousArtifacts := Set(
"org.locationtech.geotrellis" %% "geotrellis-s3" % Version.previousVersion
),
Expand Down
Empty file modified scripts/runTestS3.sh
100644 → 100755
Empty file.

0 comments on commit 581d1cd

Please sign in to comment.