geotrellis upgrade to 3.7.1

geotrellis-accumulo-extensions/pom.xml

@@ -25,12 +25,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <!--https://github.com/typelevel/cats/issues/3628-->
-            <groupId>org.typelevel</groupId>
-            <artifactId>cats-kernel_${scala.binary.version}</artifactId>
-            <version>2.4.2</version>
-        </dependency>
         <dependency>
             <groupId>org.openeo</groupId>
             <artifactId>geotrellis-common</artifactId>

geotrellis-sentinelhub/pom.xml

@@ -15,7 +15,7 @@
             <!--https://github.com/typelevel/cats/issues/3628-->
             <groupId>org.typelevel</groupId>
             <artifactId>cats-kernel_${scala.binary.version}</artifactId>
-            <version>2.4.2</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.openeo</groupId>

openeo-geotrellis/pom.xml

@@ -286,7 +286,9 @@
                         <PATH>../venv/bin:${env.PATH}</PATH>
                         <LD_LIBRARY_PATH>/tmp_epod/gdal:../venv/lib/python3.8/site-packages/jep</LD_LIBRARY_PATH>
                         <PROJ_LIB>/tmp_epod/gdal/data</PROJ_LIB>
+                        <SPARK_LOCAL_IP>127.0.0.1</SPARK_LOCAL_IP>
                     </environmentVariables>
+                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED</argLine>
                     <systemPropertyVariables>
                         <software.amazon.awssdk.http.service.impl>software.amazon.awssdk.http.apache.ApacheSdkHttpService</software.amazon.awssdk.http.service.impl>
                     </systemPropertyVariables>

openeo-geotrellis/src/main/scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala

@@ -24,7 +24,7 @@ import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.model.PutObjectRequest
 import software.amazon.awssdk.transfer.s3.S3TransferManager
 import software.amazon.awssdk.transfer.s3.model.UploadFileRequest
-import ucar.ma2.{ArrayDouble, ArrayInt, DataType}
+import ucar.ma2.{ArrayDouble, ArrayInt, DataType, InvalidRangeException}
 import ucar.nc2.write.Nc4ChunkingDefault
 import ucar.nc2.{Attribute, Dimension, NetcdfFileWriter, Variable}
 
@@ -759,7 +759,6 @@ object NetCDFRDDWriter {
     if (coordinates != null) netcdfFile.addVariableAttribute(variableName, "coordinates", coordinates)
   }
 
-  import org.opengis.coverage.grid.InvalidRangeException
 
   @throws[IOException]
   @throws[InvalidRangeException]

openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala

@@ -396,7 +396,7 @@ class OpenEOProcessesSpec extends RasterMatchers {
     // Compare to reference tile.
     saveRDD(resultCube.toSpatial(times.head),2, "groupByGeometry_2017-01-15_actual.tif", 6, Some(datacube.metadata.extent))
     val actualRaster = GeoTiffRasterSource("groupByGeometry_2017-01-15_actual.tif").read().get
-    val referenceRaster = GeoTiffRasterSource("https://artifactory.vgt.vito.be/artifactory/testdata-public/groupByGeometry_2017-01-15_reference.tif").read().get
+    val referenceRaster = GeoTiffRasterSource("https://artifactory.vgt.vito.be/artifactory/testdata-public/openeo/geotrellis_extrensions/testGroupAndMaskByGeometry.tif").read().get
     assertRastersEqual(referenceRaster, actualRaster)
 
     // Visualize RDD.

openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/AgEra5FileLayerProviderTest.scala

@@ -59,8 +59,8 @@ class AgEra5FileLayerProviderTest {
 
     assertEquals(27902.167,histogram(0).mean().get,1.0)
     assertEquals(0.247,histogram(1).mean().get,0.01)
-    assertEquals(11414687,histogram(2).mean().get,1.0)
-    assertEquals(1158,histogram(0).totalCount())
+    assertEquals(11413342,histogram(2).mean().get,1.0)
+    assertEquals(1157,histogram(0).totalCount())
     assertEquals(1224,histogram(1).totalCount())
     assertEquals(2500,histogram(2).totalCount())
 
@@ -72,7 +72,7 @@ class AgEra5FileLayerProviderTest {
   }
 
   @Test
-  def agEra5WithOpensearchClient(): Unit = {
+  def agEra5UTM(): Unit = {
     val utm31 = CRS.fromEpsgCode(32631)
     val projectedExtent = ProjectedExtent(ProjectedExtent(extent, LatLng).reproject(utm31),utm31)
     val projectedPolygons = ProjectedPolygons.fromExtent(projectedExtent.extent, s"EPSG:${projectedExtent.crs.epsgCode.get}")

pom.xml

@@ -7,17 +7,17 @@
     <packaging>pom</packaging>
     <name>openeo-geotrellis-extensions</name>
     <properties>
-        <gt-version>21.2</gt-version>
+        <gt-version>25.0</gt-version>
         <hadoop.version>3.1.1</hadoop.version>
         <avro.version>1.7.7</avro.version>
         <spark.version>3.4.2</spark.version>
         <scala.binary.version>2.12</scala.binary.version>
         <scala.version>2.12.18</scala.version>
-        <geotrellis.version>3.6.0</geotrellis.version>
+        <geotrellis.version>3.7.1</geotrellis.version>
         <gdal-bindings.version>3.8.0</gdal-bindings.version>
         <commons-compress-version>1.10</commons-compress-version>
         <gwc-geotrellis.version>0.17.0_2.12-SNAPSHOT</gwc-geotrellis.version>
-        <openeo-opensearch-client.version>1.4.0_2.12-SNAPSHOT</openeo-opensearch-client.version>
+        <openeo-opensearch-client.version>1.5.0_2.12-SNAPSHOT</openeo-opensearch-client.version>
         <awssdk.version>2.21.26</awssdk.version>
         <jaxb.api.version>2.3.0</jaxb.api.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>