Release v2.2.0

hylkevds · hylkevds · commit 2cdea318f9bf · 2023-09-26T11:16:39.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,52 +11,45 @@ updates:
         patterns:
           - "*"
 
-  # Maintain dependencies for Maven in the v2.1.x branch
+  # Maintain dependencies for Maven in the v2.2.x branch
   - package-ecosystem: "maven"
     directory: "/"
-    target-branch: v2.1.x
+    target-branch: v2.2.x
     schedule:
       interval: "weekly"
     groups:
       dependencies:
         patterns:
           - "*"
 
-  # Maintain dependencies for Maven in the v2.0.x branch
+  # Maintain dependencies for Maven in the v2.1.x branch
   - package-ecosystem: "maven"
     directory: "/"
-    target-branch: v2.0.x
+    target-branch: v2.1.x
     schedule:
       interval: "weekly"
     groups:
       dependencies:
         patterns:
           - "*"
-    ignore:
-      - dependency-name: "org.jooq:jooq"
-        versions: ["[3.17,)"]
-      - dependency-name: "org.liquibase:liquibase-core"
-        versions: ["[4.12,)"]
-      - dependency-name: "org.openjfx"
-        versions: ["[19.0,)"]
 
-  # Maintain dependencies for Maven in the v1.15.x branch
+  # Maintain dependencies for Maven in the v2.0.x branch
   - package-ecosystem: "maven"
     directory: "/"
-    target-branch: v1.15.x
+    target-branch: v2.0.x
     schedule:
       interval: "weekly"
     groups:
       dependencies:
         patterns:
           - "*"
     ignore:
-      - dependency-name: "com.github.dasniko:testcontainers-keycloak"
-        update-types: ["version-update:semver-major"]
       - dependency-name: "org.jooq:jooq"
         versions: ["[3.17,)"]
       - dependency-name: "org.liquibase:liquibase-core"
         versions: ["[4.12,)"]
+      - dependency-name: "org.openjfx"
+        versions: ["[19.0,)"]
 
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
diff --git a/.github/workflows/maven-build-scheduled.yml b/.github/workflows/maven-build-scheduled.yml
@@ -11,8 +11,8 @@ jobs:
   build:
     strategy:
       matrix:
-        refs: [refs/tags/v2.1.2, refs/tags/v2.0.8, refs/tags/v1.15.2]
-    runs-on: ubuntu-20.04
+        refs: [refs/tags/v2.2.0, refs/tags/v2.1.5, refs/tags/v2.0.11]
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Source
       uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Development version 2.2.0
+## Release version 2.2.0
 
 **New Features**
 * Improved configuration options for logging.
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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModel</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelLoader</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OpenApi</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</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.2.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Tools</artifactId>
diff --git 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: latest
+      tag: 2.2.0
       pullPolicy: IfNotPresent
     # FROST-Server HTTP deployment settings
     replicas: 1
@@ -186,7 +186,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-mqtt
-      tag: latest
+      tag: 2.2.0
       pullPolicy: IfNotPresent
     # FROST-Server MQTT deployment settings
     enabled: true
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.2.0-SNAPSHOT</version>
+    <version>2.2.0</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>HEAD</tag>
+        <tag>v2.2.0</tag>
         <url>https://github.com/FraunhoferIOSB/FROST-Server/tree/v2.x</url>
     </scm>
 
