Update GDAL up to 3.9.x (#3540)

* Update GDAL up to 3.9.x * Bump gdal-warp-bindings version up to the stable release * CHANGELOG.md rotate
locationtech · May 19, 2024 · 049a1b3 · 049a1b3
1 parent 6c3e8c8
commit 049a1b3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -31,7 +31,7 @@ services:
     network_mode: host
 
   test-jdk11:
-    image: daunnc/osgeo-gdal-jdk11:3.8.5
+    image: daunnc/osgeo-gdal-jdk11:3.9.0
     working_dir: /usr/local/src
     command: sbt ++$SCALA_VERSION test
     environment:
@@ -47,7 +47,7 @@ services:
     network_mode: host
 
   test-jdk21:
-    image: daunnc/osgeo-gdal-jdk21:3.8.5
+    image: daunnc/osgeo-gdal-jdk21:3.9.0
     working_dir: /usr/local/src
     command: bash -c "cp -f .jvmopts.211 .jvmopts; sbt ++$SCALA_VERSION test"
     environment:

diff --git a/.github/docker/gdal/3.x/ubuntu/Dockerfile b/.github/docker/gdal/3.x/ubuntu/Dockerfile
@@ -1,9 +1,9 @@
 # docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
 # docker buildx inspect --bootstrap
 #
-# docker buildx build --build-arg="JAVA_VERSION=11" --build-arg="GDAL_VERSION=3.8.5" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk11:3.8.5 .
-# docker buildx build --build-arg="JAVA_VERSION=17" --build-arg="GDAL_VERSION=3.8.5" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk17:3.8.5 .
-# docker buildx build --build-arg="JAVA_VERSION=21" --build-arg="GDAL_VERSION=3.8.5" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk21:3.8.5 .
+# docker buildx build --build-arg="JAVA_VERSION=11" --build-arg="GDAL_VERSION=3.9.0" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk11:3.9.0 .
+# docker buildx build --build-arg="JAVA_VERSION=17" --build-arg="GDAL_VERSION=3.9.0" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk17:3.9.0 .
+# docker buildx build --build-arg="JAVA_VERSION=21" --build-arg="GDAL_VERSION=3.9.0" --platform linux/amd64,linux/arm64 --push --tag daunnc/osgeo-gdal-jdk21:3.9.0 .
 
 ARG GDAL_VERSION=3.8.5
 FROM ghcr.io/osgeo/gdal:ubuntu-full-${GDAL_VERSION}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Bump GeoTools version up to 30.x [#3521](https://github.com/locationtech/geotrellis/pull/3521)
-- Fix not found: type Serializable compiler bug [#3535](https://github.com/locationtech/geotrellis/pull/3535)
+- Dependecies update & fix "not found: type Serializable" compiler bug [#3535](https://github.com/locationtech/geotrellis/pull/3535)
+- Update GDAL up to 3.9.x [#3540](https://github.com/locationtech/geotrellis/pull/3540)
 
 ## [3.7.1] - 2024-01-08
 

diff --git a/gdal/src/test/resources/vlm/lc8-utm-re-mosaic-expected.tif b/gdal/src/test/resources/vlm/lc8-utm-re-mosaic-expected.tif
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -23,8 +23,8 @@ object Version {
   val cassandra   = "4.17.0"
   val hbase       = "2.5.8"
   val hadoop      = "3.3.6"
-  val gdal        = "3.8.0"
-  val gdalWarp    = "3.8.1"
+  val gdal        = "3.9.0"
+  val gdalWarp    = "3.9.0"
 
   val previousVersion = "3.6.0"
 }

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -31,18 +31,20 @@ object Settings {
   def javaMajorVersion: Int = System.getProperty("java.version").split("\\.").head.toInt
 
   object Repositories {
-    val apacheSnapshots = "apache-snapshots" at "https://repository.apache.org/content/repositories/snapshots/"
-    val eclipseReleases = "eclipse-releases" at "https://repo.eclipse.org/content/groups/releases"
-    val osgeoReleases   = "osgeo-releases" at "https://repo.osgeo.org/repository/release/"
-    val osgeoSnapshots  = "osgeo-snapshots" at "https://repo.osgeo.org/repository/snapshot/"
-    val geosolutions    = "geosolutions" at "https://maven.geo-solutions.it/"
-    val jitpack         = "jitpack" at "https://jitpack.io" // for https://github.com/everit-org/json-schema
-    val ivy2Local       = Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
-    val mavenLocal      = Resolver.mavenLocal
-    val maven           = DefaultMavenRepository
-    val local           = Seq(ivy2Local, mavenLocal)
-    val external        = Seq(osgeoReleases, maven, eclipseReleases, geosolutions, jitpack, apacheSnapshots, osgeoSnapshots)
-    val all             = external ++ local
+    val apacheSnapshots   = "apache-snapshots" at "https://repository.apache.org/content/repositories/snapshots/"
+    val eclipseReleases   = "eclipse-releases" at "https://repo.eclipse.org/content/groups/releases"
+    val osgeoReleases     = "osgeo-releases" at "https://repo.osgeo.org/repository/release/"
+    val osgeoSnapshots    = "osgeo-snapshots" at "https://repo.osgeo.org/repository/snapshot/"
+    val geosolutions      = "geosolutions" at "https://maven.geo-solutions.it/"
+    val jitpack           = "jitpack" at "https://jitpack.io" // for https://github.com/everit-org/json-schema
+    val ivy2Local         = Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
+    val mavenLocal        = Resolver.mavenLocal
+    val maven             = DefaultMavenRepository
+    val sonatypeReleases  = Resolver.sonatypeOssRepos("releases") 
+    val sonatypeSnapshots = Resolver.sonatypeOssRepos("snapshots")
+    val local             = Seq(ivy2Local, mavenLocal)
+    val external          = Seq(osgeoReleases, maven, eclipseReleases, geosolutions, jitpack, apacheSnapshots, osgeoSnapshots) ++ sonatypeReleases ++ sonatypeSnapshots
+    val all               = external ++ local
   }
 
   lazy val noForkInTests = Seq(