From bbbcbc3155971a3fcf053a36da58018d1d565167 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:09:56 +0100
Subject: [PATCH] upgrade to Java 21 JDK

upgrade to Java 21 JDK
---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/release_backend.yml | 2 +-
 .github/workflows/run_autodoc.yml     | 2 +-
 .github/workflows/test_backend.yml    | 2 +-
 .github/workflows/test_cypress.yml    | 2 +-
 backend.Dockerfile                    | 2 +-
 backend/pom.xml                       | 5 ++---
 pom.xml                               | 6 +++---
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7d8fe7ddd0..45fba25f8c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -48,7 +48,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         overwrite-settings: false
 
       # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/release_backend.yml b/.github/workflows/release_backend.yml
index 05b7e45261..d26bd51634 100644
--- a/.github/workflows/release_backend.yml
+++ b/.github/workflows/release_backend.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
       - name: Cache local Maven repository
         uses: actions/cache@v2
diff --git a/.github/workflows/run_autodoc.yml b/.github/workflows/run_autodoc.yml
index ba1ce0abb9..e8b84d02bc 100644
--- a/.github/workflows/run_autodoc.yml
+++ b/.github/workflows/run_autodoc.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Build Backend
         run: mvn install -T 1C -DskipTests -pl '!executable'
       - name: Run AutoDoc
diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml
index f250dfcc49..e9090f1823 100644
--- a/.github/workflows/test_backend.yml
+++ b/.github/workflows/test_backend.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
       - name: Build Backend
         run: mvn -T 1C install -pl backend -DskipTests -am
diff --git a/.github/workflows/test_cypress.yml b/.github/workflows/test_cypress.yml
index 8990da08ab..c8d2e6525f 100644
--- a/.github/workflows/test_cypress.yml
+++ b/.github/workflows/test_cypress.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
 
       - name: Build Backend
diff --git a/backend.Dockerfile b/backend.Dockerfile
index c1d50f95aa..76fe33d829 100644
--- a/backend.Dockerfile
+++ b/backend.Dockerfile
@@ -7,7 +7,7 @@ COPY .git .
 RUN git describe --tags |  sed 's/^v//' > git_describe.txt
 
 # Builder
-FROM maven:3.8-openjdk-17-slim AS builder
+FROM maven:3.9-eclipse-temurin-21 AS builder
 
 WORKDIR /app
 
diff --git a/backend/pom.xml b/backend/pom.xml
index 0baa0b2fe7..32073194b1 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -163,10 +163,9 @@
             <version>2.9.1</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>3.0.13</version>
-            <classifier>indy</classifier>
+            <version>4.0.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index 9329496399..935b4718d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,12 @@
 	</parent>
 
 	<properties>
-		<java.required>17</java.required>
-		<lombok.version>1.18.24</lombok.version>
+		<java.required>21</java.required>
+		<lombok.version>1.18.36</lombok.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>${java.required}</maven.compiler.source>
 		<maven.compiler.target>${java.required}</maven.compiler.target>
-		<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
+		<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
 		<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssXXX</maven.build.timestamp.format>
 		<build.time>${maven.build.timestamp}</build.time>
 		<revision>0.0.0-SNAPSHOT</revision>