Merge branch 'main' of github.com:/skfit-uni-luebeck/openehr-obds-code

Author: nr23730

.github/workflows/docker-image.yml

@@ -12,7 +12,7 @@ jobs:
         uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - uses: actions/checkout@v6
 
@@ -25,7 +25,7 @@ jobs:
 
       - name: Build and push image
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           push: true
           tags: ghcr.io/itcr-uni-luebeck/obds2openehr:latest

.gitlab-ci.yml

@@ -2,9 +2,9 @@ build-latest:
   stage: build
   tags:
     - docker
-  image: docker:29.2.1
+  image: docker:29.5.3
   services:
-     - name: docker:29.2.1-dind
+     - name: docker:29.5.3-dind
        alias: docker-dind
   variables:
      DOCKER_TLS_CERTDIR: ""
@@ -31,9 +31,9 @@ build-release:
   stage: build
   tags:
     - docker
-  image: docker:29.2.1
+  image: docker:29.5.3
   services:
-     - name: docker:29.2.1-dind
+     - name: docker:29.5.3-dind
        alias: docker-dind
   variables:
      DOCKER_TLS_CERTDIR: ""

pom.xml

@@ -37,12 +37,12 @@
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
-            <version>8.8.0</version>
+            <version>8.10.0</version>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-client</artifactId>
-            <version>8.8.0</version>
+            <version>8.10.0</version>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
@@ -57,12 +57,12 @@
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
             <artifactId>serialisation</artifactId>
-            <version>2.29.0</version>
+            <version>2.31.0</version>
         </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
             <artifactId>client</artifactId>
-            <version>2.29.0</version>
+            <version>2.31.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>7.0.5</version>
+            <version>7.0.7</version>
         </dependency>
         <dependency>
             <groupId>org.tinylog</groupId>
@@ -133,12 +133,12 @@
         <dependency>
             <groupId>org.zoomba-lang</groupId>
             <artifactId>spark-core</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.14.0</version>
+            <version>2.14.2</version>
         </dependency>
     </dependencies>
     <build>