restore logging after upgrade to Spark 3.5.x

* fix logging for some submodules #382

* Update logging in poms for more submodules #382

* DRY #382

* fixing logging restored additional jobs/stages #382

---------

Co-authored-by: Jan Van den bosch <jan.vandenbosch@hotmail.com>

Author: EmileSonneveld

geotrellis-sentinelhub/pom.xml

@@ -41,30 +41,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
@@ -120,9 +96,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.sksamuel.elastic4s</groupId>
+            <groupId>nl.gn0s1s</groupId>
             <artifactId>elastic4s-client-esjava_${scala.binary.version}</artifactId>
-            <version>7.8.1</version>
+            <version>7.17.25</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>

openeo-geotrellis/src/main/scala/org/openeo/geotrellis/layers/FileLayerProvider.scala

@@ -434,6 +434,7 @@ object FileLayerProvider {
             val filtered = prepareMask(theMask, metadata, partitioner)
 
             if (logger.isDebugEnabled) {
+              // the number of jobs/stages effectively depends on whether logging is correctly configured
               logger.debug(s"SpacetimeMask mask reduces the input to: ${filtered.countApproxDistinct()} keys.")
             }
 

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

@@ -598,9 +598,9 @@ class Sentinel2FileLayerProviderTest extends RasterMatchers {
     val referenceTile = GeoTiffRasterSource(ref).read().get
     val actualTile = GeoTiffRasterSource(actual).read().get
     assertRastersEqual(referenceTile, actualTile, 160.0)
-    //because debugging is enabled, it actually runs more jobs and stages then done in production
-    assertEquals(4,listener.getJobsCompleted)
-    assertEquals(17, listener.getStagesCompleted)
+    //because debug logging is enabled during tests, it actually runs more jobs and stages than done in production
+    assertEquals(5, listener.getJobsCompleted)
+    assertEquals(18, listener.getStagesCompleted)
 
   }
 

openeo-logging/pom.xml

@@ -41,13 +41,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.19.0</version>
+      <version>2.20.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -41,6 +41,12 @@
                 <artifactId>scala-library</artifactId>
                 <version>${scala.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>2.0.7</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>