From ee34cf5626c64452dc17054386b80b005351ba77 Mon Sep 17 00:00:00 2001
From: Miguel <141239860+Miguel7373@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:53:04 +0100
Subject: [PATCH] Feature/1032 update javaversion (#1103)

* change java version to 21

* edit java version in pom and edit version in pipes to github action variable

* add generic version to name strings

---------

Co-authored-by: Nevio Di Gennaro <digennaro@puzzle.ch>
Co-authored-by: GitHub Actions <actions@github.com>
---
 .github/workflows/backend-test-action.yml   | 4 ++--
 .github/workflows/demo-deploy-action.yml    | 4 ++--
 .github/workflows/deploy-action.yml         | 4 ++--
 .github/workflows/format-action.yml         | 4 ++--
 .github/workflows/frontend-test-action.yml  | 4 ++--
 .github/workflows/staging-deploy-action.yml | 4 ++--
 pom.xml                                     | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/backend-test-action.yml b/.github/workflows/backend-test-action.yml
index 428368d7ff..c31d16410f 100644
--- a/.github/workflows/backend-test-action.yml
+++ b/.github/workflows/backend-test-action.yml
@@ -10,10 +10,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
 
       - name: Use Maven to run unittests and integration tests
diff --git a/.github/workflows/demo-deploy-action.yml b/.github/workflows/demo-deploy-action.yml
index b237b77150..59102f9846 100644
--- a/.github/workflows/demo-deploy-action.yml
+++ b/.github/workflows/demo-deploy-action.yml
@@ -50,10 +50,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
 
       - name: Set up node 18
diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml
index d3f81979b6..44dee585c9 100644
--- a/.github/workflows/deploy-action.yml
+++ b/.github/workflows/deploy-action.yml
@@ -26,10 +26,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
 
       - name: Set up node 18
diff --git a/.github/workflows/format-action.yml b/.github/workflows/format-action.yml
index bf3d25bd7f..8ab0c9dd70 100644
--- a/.github/workflows/format-action.yml
+++ b/.github/workflows/format-action.yml
@@ -46,10 +46,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
           server-id: github
           settings-path: ${{github.workspace}}
diff --git a/.github/workflows/frontend-test-action.yml b/.github/workflows/frontend-test-action.yml
index 73c35e400c..2f34b3596b 100644
--- a/.github/workflows/frontend-test-action.yml
+++ b/.github/workflows/frontend-test-action.yml
@@ -28,10 +28,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
 
       - uses: abhi1693/setup-browser@v0.3.5
diff --git a/.github/workflows/staging-deploy-action.yml b/.github/workflows/staging-deploy-action.yml
index 1a4495dcd9..07d18713e1 100644
--- a/.github/workflows/staging-deploy-action.yml
+++ b/.github/workflows/staging-deploy-action.yml
@@ -50,10 +50,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{vars.JAVA_VERSION}}
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{vars.JAVA_VERSION}}
           distribution: 'adopt'
 
       - name: Set up node 
diff --git a/pom.xml b/pom.xml
index 1e467d8114..0c521dc5a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,9 @@
     </modules>
 
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>