Prepare for next development iteration

FraunhoferIOSB · Aug 30, 2024 · 95b108c · 95b108c
1 parent e589394
commit 95b108c
Show file tree

Hide file tree

Showing 37 changed files with 57 additions and 38 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,6 +12,18 @@ updates:
           - "*"
 
 
+  # Maintain dependencies for Maven in the v2.3.x branch
+  - package-ecosystem: "maven"
+    directory: "/"
+    target-branch: v2.4.x
+    schedule:
+      interval: "weekly"
+    groups:
+      dependencies:
+        patterns:
+          - "*"
+
+
   # Maintain dependencies for Maven in the v2.3.x branch
   - package-ecosystem: "maven"
     directory: "/"

diff --git a/.github/workflows/maven-build-scheduled.yml b/.github/workflows/maven-build-scheduled.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        refs: [refs/tags/v2.3.3, refs/tags/v2.2.4]
+        refs: [refs/tags/v2.4.0, refs/tags/v2.3.3, refs/tags/v2.2.4]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Source

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Development version 2.5.0
+
+**New Features**
+
+**Internal changes & Bugfixes**
+
+
 ## Release version 2.4.0
 
 **New Features**

diff --git a/FROST-Server.Auth.Basic/pom.xml b/FROST-Server.Auth.Basic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Auth.Basic</artifactId>

diff --git a/FROST-Server.Auth.Keycloak/pom.xml b/FROST-Server.Auth.Keycloak/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Auth.Keycloak</artifactId>

diff --git a/FROST-Server.Core.Model/pom.xml b/FROST-Server.Core.Model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Core.Model</artifactId>

diff --git a/FROST-Server.Core/pom.xml b/FROST-Server.Core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Core</artifactId>

diff --git a/FROST-Server.HTTP.Common/pom.xml b/FROST-Server.HTTP.Common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.HTTP.Common</artifactId>

diff --git a/FROST-Server.HTTP/pom.xml b/FROST-Server.HTTP/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.HTTP</artifactId>

diff --git a/FROST-Server.MQTT.Moquette/pom.xml b/FROST-Server.MQTT.Moquette/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTT.Moquette</artifactId>

diff --git a/FROST-Server.MQTT/pom.xml b/FROST-Server.MQTT/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTT</artifactId>

diff --git a/FROST-Server.MQTTP/pom.xml b/FROST-Server.MQTTP/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTTP</artifactId>

diff --git a/FROST-Server.SQLjooq/pom.xml b/FROST-Server.SQLjooq/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.SQLjooq</artifactId>

diff --git a/FROST-Server.Tests/pom.xml b/FROST-Server.Tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Tests</artifactId>

diff --git a/FROST-Server.Util/pom.xml b/FROST-Server.Util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Util</artifactId>

diff --git a/Plugins/Actuation/pom.xml b/Plugins/Actuation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.Actuation</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/BatchProcessing/pom.xml b/Plugins/BatchProcessing/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.BatchProcessing</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/CoreModel/pom.xml b/Plugins/CoreModel/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModel</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/CoreModelV2/pom.xml b/Plugins/CoreModelV2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModelV2</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/FormatCsv/pom.xml b/Plugins/FormatCsv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatCsv</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/FormatDataArray/pom.xml b/Plugins/FormatDataArray/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatDataArray</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/FormatGeoJson/pom.xml b/Plugins/FormatGeoJson/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatGeoJson</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/ModelLoader/pom.xml b/Plugins/ModelLoader/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelLoader</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/ModelOM/pom.xml b/Plugins/ModelOM/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelOM</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/ModelRelations/pom.xml b/Plugins/ModelRelations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelRelations</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/ModelSampling/pom.xml b/Plugins/ModelSampling/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelSampling</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/MultiDatastream/pom.xml b/Plugins/MultiDatastream/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.MultiDatastream</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/OData/pom.xml b/Plugins/OData/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OData</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/OpenApi/pom.xml b/Plugins/OpenApi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OpenApi</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/Projects/pom.xml b/Plugins/Projects/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.Projects</artifactId>
     <packaging>jar</packaging>

diff --git a/Plugins/pom.xml b/Plugins/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/Tools/ModelEditor/pom.xml b/Tools/ModelEditor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Tools</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/Tools/ModelExtractor/pom.xml b/Tools/ModelExtractor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Tools</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/Tools/pom.xml b/Tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Tools</artifactId>

diff --git a/helm/frost-server/Chart.yaml b/helm/frost-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: frost-server
-version: 2.4.0
-appVersion: 2.4.0
+version: 2.5.0
+appVersion: 2.5.0
 description: The FROST-Server (FRaunhofer Opensource SensorThings-Server) is the first complete, open-source implementation of the OGC SensorThings API Part 1 (Sensing).
 keywords:
   - sensorthings-api

diff --git a/helm/frost-server/values.yaml b/helm/frost-server/values.yaml
@@ -115,7 +115,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-http
-      tag: 2.4.0
+      tag: latest
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server HTTP deployment settings
@@ -198,7 +198,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-mqtt
-      tag: 2.4.0
+      tag: latest
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server MQTT deployment settings

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
     <artifactId>FROST-ServerParent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>FROST-ServerParent</name>
@@ -54,7 +54,7 @@
     <scm>
         <connection>scm:git:git://github.com/FraunhoferIOSB/SensorThingsServer.git</connection>
         <developerConnection>scm:git:ssh://github.com:FraunhoferIOSB/SensorThingsServer.git</developerConnection>
-        <tag>v2.4.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/FraunhoferIOSB/FROST-Server/tree/v2.x</url>
     </scm>