Merge commit '52f33d9452255564d6c3b41b8e7f9dbf433f32fa'

Author: SebaDro

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
-## 4.2.0-beta.1
+## 4.2.0
+* Update base Docker run image [00e3796](00e379681fc2216ecf62e3d701c80464398cf3f4)
+* Fix reading features in a byte array [c6a35d5](c6a35d5b6a65f1d22ff37905a8a3f37e0a6e39f5)
 * Set default log level to DEBUG [1582c81](1582c81a3bf31e627492c6be7e217e44d2f55de6)
 * Fix empty value list for aggregation [2e70c12](2e70c12940b34f8890b9a8c828285290ee0f233c)
 * Fix higher spatial unit aggregation [f8b4d32](f8b4d32f94595914c65c6303b6919e3a589b5536)

Dockerfile

@@ -18,7 +18,7 @@ COPY . /app/kommonitor-importer/
 RUN mvn -f ./kommonitor-importer/pom.xml clean install -Dapp.finalName=kommonitor-importer-app
 
 # ---- Run the application ----
-FROM eclipse-temurin:17.0.11_9-jdk-alpine
+FROM eclipse-temurin:17.0.14_7-jdk-alpine
 WORKDIR /app
 
 # Copy from the base build image

kommonitor-datamanagement-api-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.n52.kommonitor</groupId>
         <artifactId>kommonitor-importer</artifactId>
-        <version>4.2.0-beta.1</version>
+        <version>4.2.0</version>
     </parent>
 
     <artifactId>kommonitor-data-management-api-client</artifactId>

kommonitor-importer-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.kommonitor</groupId>
         <artifactId>kommonitor-importer</artifactId>
-        <version>4.2.0-beta.1</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kommonitor-importer-app/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kommonitor-importer</artifactId>
         <groupId>org.n52.kommonitor</groupId>
-        <version>4.2.0-beta.1</version>
+        <version>4.2.0</version>
     </parent>
     <properties>
         <app.finalName>${artifactId}-${version}</app.finalName>

kommonitor-importer-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kommonitor-importer</artifactId>
         <groupId>org.n52.kommonitor</groupId>
-        <version>4.2.0-beta.1</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kommonitor-importer-core/src/main/java/org/n52/kommonitor/importer/io/datasource/APIFeaturesRetriever.java

@@ -144,7 +144,7 @@ public Dataset<InputStream> retrieveDataset(DataSourceDefinitionType datasource)
                 byte[] response = apiClient.getAllSpatialUnitFeaturesById(bboxValue,  "original");
 
                 // Extract bbox for first stage filtering (intersection with bbox)
-                DefaultFeatureCollection featureCollection = (DefaultFeatureCollection) featureJSON.readFeatureCollection(response);
+                DefaultFeatureCollection featureCollection = (DefaultFeatureCollection) featureJSON.readFeatureCollection(new ByteArrayInputStream(response));
                 ReferencedEnvelope envelope = featureCollection.getBounds();
                 bbox = String.format(Locale.US, "%f,%f,%f,%f", envelope.getMinX(), envelope.getMinY(), envelope.getMaxX(), envelope.getMaxY());
 

kommonitor-models/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kommonitor-importer</artifactId>
         <groupId>org.n52.kommonitor</groupId>
-        <version>4.2.0-beta.1</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.n52.kommonitor</groupId>
     <artifactId>kommonitor-importer</artifactId>
-    <version>4.2.0-beta.1</version>
+    <version>4.2.0</version>
     <modules>
         <module>kommonitor-models</module>
         <module>kommonitor-importer-api</module>
@@ -20,7 +20,7 @@
 	    <url>https://github.com/KomMonitor/kommonitor-importer/</url>
         <connection>scm:git:https://github.com/KomMonitor/kommonitor-importer.git</connection>
         <developerConnection>scm:git:https://github.com/KomMonitor/kommonitor-importer.git</developerConnection>
-	    <tag>4.2.0-beta.1</tag>
+	    <tag>4.2.0</tag>
   </scm>
 
     <properties>
@@ -30,7 +30,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <spring-boot.version>3.5.5</spring-boot.version>
-        <api-client.version>4.2.0-beta.1</api-client.version>
+        <api-client.version>4.2.0</api-client.version>
         <jts.version>1.19.0</jts.version>
         <maven-surefire.version>3.2.2</maven-surefire.version>
         <maven-failsafe.version>3.2.2</maven-failsafe.version>