From 12c405b9f6fc9705914742a08deee569d60851d6 Mon Sep 17 00:00:00 2001 From: Hylke van der Schaaf Date: Fri, 23 Feb 2024 17:15:18 +0100 Subject: [PATCH] Prepare for next development iteration --- CHANGELOG.md | 7 +++++++ FROST-Server.Auth.Basic/pom.xml | 2 +- FROST-Server.Auth.Keycloak/pom.xml | 2 +- FROST-Server.Core.Model/pom.xml | 2 +- FROST-Server.Core/pom.xml | 2 +- FROST-Server.HTTP.Common/pom.xml | 2 +- FROST-Server.HTTP/pom.xml | 2 +- FROST-Server.MQTT.Moquette/pom.xml | 2 +- FROST-Server.MQTT/pom.xml | 2 +- FROST-Server.MQTTP/pom.xml | 2 +- FROST-Server.SQLjooq/pom.xml | 2 +- FROST-Server.Tests/pom.xml | 2 +- FROST-Server.Util/pom.xml | 2 +- Plugins/Actuation/pom.xml | 2 +- Plugins/BatchProcessing/pom.xml | 2 +- Plugins/CoreModel/pom.xml | 2 +- Plugins/FormatCsv/pom.xml | 2 +- Plugins/FormatDataArray/pom.xml | 2 +- Plugins/FormatGeoJson/pom.xml | 2 +- Plugins/ModelLoader/pom.xml | 2 +- Plugins/MultiDatastream/pom.xml | 2 +- Plugins/OData/pom.xml | 2 +- Plugins/OpenApi/pom.xml | 2 +- Plugins/pom.xml | 2 +- Tools/ModelEditor/pom.xml | 2 +- Tools/ModelExtractor/pom.xml | 2 +- Tools/pom.xml | 2 +- helm/frost-server/Chart.yaml | 4 ++-- helm/frost-server/values.yaml | 4 ++-- pom.xml | 4 ++-- 30 files changed, 39 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f3b6bbf..b71a9ce28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Development version 2.4.0 + +**New Features** + +**Internal changes & Bugfixes** + + ## Release version 2.3.0 NOTE: The helm option `frost.http.ingress.rewriteTarget` had a typo in it diff --git a/FROST-Server.Auth.Basic/pom.xml b/FROST-Server.Auth.Basic/pom.xml index ecde421f3..a4f8754f4 100644 --- a/FROST-Server.Auth.Basic/pom.xml +++ b/FROST-Server.Auth.Basic/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Auth.Basic diff --git a/FROST-Server.Auth.Keycloak/pom.xml b/FROST-Server.Auth.Keycloak/pom.xml index afb488354..7aa007629 100644 --- a/FROST-Server.Auth.Keycloak/pom.xml +++ b/FROST-Server.Auth.Keycloak/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Auth.Keycloak diff --git a/FROST-Server.Core.Model/pom.xml b/FROST-Server.Core.Model/pom.xml index b06d2edbf..325e2aaeb 100644 --- a/FROST-Server.Core.Model/pom.xml +++ b/FROST-Server.Core.Model/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Core.Model diff --git a/FROST-Server.Core/pom.xml b/FROST-Server.Core/pom.xml index 1c16a02c8..f7571d563 100644 --- a/FROST-Server.Core/pom.xml +++ b/FROST-Server.Core/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Core diff --git a/FROST-Server.HTTP.Common/pom.xml b/FROST-Server.HTTP.Common/pom.xml index ac3c87ea6..63d633992 100644 --- a/FROST-Server.HTTP.Common/pom.xml +++ b/FROST-Server.HTTP.Common/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.HTTP.Common diff --git a/FROST-Server.HTTP/pom.xml b/FROST-Server.HTTP/pom.xml index d4c2ffd65..2e4d6deff 100644 --- a/FROST-Server.HTTP/pom.xml +++ b/FROST-Server.HTTP/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.HTTP diff --git a/FROST-Server.MQTT.Moquette/pom.xml b/FROST-Server.MQTT.Moquette/pom.xml index a33e81394..9502dbdc6 100644 --- a/FROST-Server.MQTT.Moquette/pom.xml +++ b/FROST-Server.MQTT.Moquette/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.MQTT.Moquette diff --git a/FROST-Server.MQTT/pom.xml b/FROST-Server.MQTT/pom.xml index 380257ddc..3b9ba7c37 100644 --- a/FROST-Server.MQTT/pom.xml +++ b/FROST-Server.MQTT/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.MQTT diff --git a/FROST-Server.MQTTP/pom.xml b/FROST-Server.MQTTP/pom.xml index 2af049b12..a78e32942 100644 --- a/FROST-Server.MQTTP/pom.xml +++ b/FROST-Server.MQTTP/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.MQTTP diff --git a/FROST-Server.SQLjooq/pom.xml b/FROST-Server.SQLjooq/pom.xml index 5b105a48e..b1d46e827 100644 --- a/FROST-Server.SQLjooq/pom.xml +++ b/FROST-Server.SQLjooq/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.SQLjooq diff --git a/FROST-Server.Tests/pom.xml b/FROST-Server.Tests/pom.xml index c169e7efb..ff14d1f46 100644 --- a/FROST-Server.Tests/pom.xml +++ b/FROST-Server.Tests/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Tests diff --git a/FROST-Server.Util/pom.xml b/FROST-Server.Util/pom.xml index 8f12bd3b0..c4cd9715d 100644 --- a/FROST-Server.Util/pom.xml +++ b/FROST-Server.Util/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Util diff --git a/Plugins/Actuation/pom.xml b/Plugins/Actuation/pom.xml index cbb4ef219..b7bb657e9 100644 --- a/Plugins/Actuation/pom.xml +++ b/Plugins/Actuation/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.Actuation jar diff --git a/Plugins/BatchProcessing/pom.xml b/Plugins/BatchProcessing/pom.xml index fa3f19971..3764a613e 100644 --- a/Plugins/BatchProcessing/pom.xml +++ b/Plugins/BatchProcessing/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.BatchProcessing jar diff --git a/Plugins/CoreModel/pom.xml b/Plugins/CoreModel/pom.xml index cbd8844aa..d755c4dfc 100644 --- a/Plugins/CoreModel/pom.xml +++ b/Plugins/CoreModel/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.CoreModel jar diff --git a/Plugins/FormatCsv/pom.xml b/Plugins/FormatCsv/pom.xml index dbbb87a54..f50c4f561 100644 --- a/Plugins/FormatCsv/pom.xml +++ b/Plugins/FormatCsv/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.FormatCsv jar diff --git a/Plugins/FormatDataArray/pom.xml b/Plugins/FormatDataArray/pom.xml index 367c63c19..d8b160321 100644 --- a/Plugins/FormatDataArray/pom.xml +++ b/Plugins/FormatDataArray/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.FormatDataArray jar diff --git a/Plugins/FormatGeoJson/pom.xml b/Plugins/FormatGeoJson/pom.xml index 613c1007b..21811a080 100644 --- a/Plugins/FormatGeoJson/pom.xml +++ b/Plugins/FormatGeoJson/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.FormatGeoJson jar diff --git a/Plugins/ModelLoader/pom.xml b/Plugins/ModelLoader/pom.xml index e792029f4..ca2a43bab 100644 --- a/Plugins/ModelLoader/pom.xml +++ b/Plugins/ModelLoader/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.ModelLoader jar diff --git a/Plugins/MultiDatastream/pom.xml b/Plugins/MultiDatastream/pom.xml index d814137e3..d3c431d2b 100644 --- a/Plugins/MultiDatastream/pom.xml +++ b/Plugins/MultiDatastream/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.MultiDatastream jar diff --git a/Plugins/OData/pom.xml b/Plugins/OData/pom.xml index cbc3c4848..a767ebd04 100644 --- a/Plugins/OData/pom.xml +++ b/Plugins/OData/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.OData jar diff --git a/Plugins/OpenApi/pom.xml b/Plugins/OpenApi/pom.xml index 4ae7f5286..8ef91adf2 100644 --- a/Plugins/OpenApi/pom.xml +++ b/Plugins/OpenApi/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Plugins - 2.3.0 + 2.4.0-SNAPSHOT FROST-Server.Plugin.OpenApi jar diff --git a/Plugins/pom.xml b/Plugins/pom.xml index 63f7fe34d..3534dc17d 100644 --- a/Plugins/pom.xml +++ b/Plugins/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/Tools/ModelEditor/pom.xml b/Tools/ModelEditor/pom.xml index 328638ac3..96e326e12 100644 --- a/Tools/ModelEditor/pom.xml +++ b/Tools/ModelEditor/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Tools - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/Tools/ModelExtractor/pom.xml b/Tools/ModelExtractor/pom.xml index 72940d66d..d75d1d360 100644 --- a/Tools/ModelExtractor/pom.xml +++ b/Tools/ModelExtractor/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-Server.Tools - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/Tools/pom.xml b/Tools/pom.xml index 9082a0c35..bb7d63d65 100644 --- a/Tools/pom.xml +++ b/Tools/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml FROST-Server.Tools diff --git a/helm/frost-server/Chart.yaml b/helm/frost-server/Chart.yaml index ba27229c0..d25641fbb 100644 --- a/helm/frost-server/Chart.yaml +++ b/helm/frost-server/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: frost-server -version: 2.3.0 -appVersion: 2.3.0 +version: 2.4.0 +appVersion: 2.4.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 index 81a10db97..30e7d2f6c 100644 --- a/helm/frost-server/values.yaml +++ b/helm/frost-server/values.yaml @@ -108,7 +108,7 @@ frost: image: registry: docker.io repository: fraunhoferiosb/frost-server-http - tag: 2.3.0 + tag: latest pullPolicy: IfNotPresent # FROST-Server HTTP deployment settings replicas: 1 @@ -186,7 +186,7 @@ frost: image: registry: docker.io repository: fraunhoferiosb/frost-server-mqtt - tag: 2.3.0 + tag: latest pullPolicy: IfNotPresent # FROST-Server MQTT deployment settings enabled: true diff --git a/pom.xml b/pom.xml index 3c6934566..bdef71c60 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.fraunhofer.iosb.ilt.FROST-Server FROST-ServerParent - 2.3.0 + 2.4.0-SNAPSHOT pom FROST-ServerParent @@ -54,7 +54,7 @@ scm:git:git://github.com/FraunhoferIOSB/SensorThingsServer.git scm:git:ssh://github.com:FraunhoferIOSB/SensorThingsServer.git - v2.3.0 + HEAD https://github.com/FraunhoferIOSB/FROST-Server/tree/v2.x