From 34040946636c25adc2a5f759483046d1a7f5bd03 Mon Sep 17 00:00:00 2001
From: Paul Heinrich <pheinrich11235@gmail.com>
Date: Thu, 25 Apr 2024 16:31:56 +0200
Subject: [PATCH 1/2] change java version to 21

---
 .github/workflows/code-coverage.yaml             | 2 +-
 .github/workflows/codeql.yml                     | 2 +-
 .github/workflows/deploy-on-pr-merge.yaml        | 2 +-
 .github/workflows/deploy-on-release-created.yaml | 2 +-
 .github/workflows/deploy-weekly.yaml             | 2 +-
 .github/workflows/full-integration.yaml          | 2 +-
 .github/workflows/verify-push.yaml               | 2 +-
 pom.xml                                          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/code-coverage.yaml b/.github/workflows/code-coverage.yaml
index 8a7054763c5..a5a28e1fdef 100644
--- a/.github/workflows/code-coverage.yaml
+++ b/.github/workflows/code-coverage.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7804cbe9423..c3601652607 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/deploy-on-pr-merge.yaml b/.github/workflows/deploy-on-pr-merge.yaml
index 11a60d440a6..44828163634 100644
--- a/.github/workflows/deploy-on-pr-merge.yaml
+++ b/.github/workflows/deploy-on-pr-merge.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: 'matsim-releases'
diff --git a/.github/workflows/deploy-on-release-created.yaml b/.github/workflows/deploy-on-release-created.yaml
index ace4f1881fb..a490c614a91 100644
--- a/.github/workflows/deploy-on-release-created.yaml
+++ b/.github/workflows/deploy-on-release-created.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: matsim-releases
diff --git a/.github/workflows/deploy-weekly.yaml b/.github/workflows/deploy-weekly.yaml
index 88e183083b7..f30f7371684 100644
--- a/.github/workflows/deploy-weekly.yaml
+++ b/.github/workflows/deploy-weekly.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: 'matsim-releases'
diff --git a/.github/workflows/full-integration.yaml b/.github/workflows/full-integration.yaml
index e63fc75985b..a75ea5767da 100644
--- a/.github/workflows/full-integration.yaml
+++ b/.github/workflows/full-integration.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/verify-push.yaml b/.github/workflows/verify-push.yaml
index 865c39583fe..f7f5bce3718 100644
--- a/.github/workflows/verify-push.yaml
+++ b/.github/workflows/verify-push.yaml
@@ -87,7 +87,7 @@ jobs:
         if: ${{matrix.module != 'matsim' || steps.detect-changes.outputs.outside-contribs == 'true'}}
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/pom.xml b/pom.xml
index 9672c87de90..a4ad5d0dd14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <argLine></argLine>
 
         <log4j.version>2.23.1</log4j.version>

From 78cbc3aed7376e4fb16002757bffda31aafcd163 Mon Sep 17 00:00:00 2001
From: Paul Heinrich <pheinrich11235@gmail.com>
Date: Thu, 2 May 2024 13:17:30 +0200
Subject: [PATCH 2/2] explicitly configure java version in maven compiler
 plugin

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index e2671993c3e..412dd491d99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -366,6 +366,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
+				<configuration>
+					<source>21</source>
+					<target>21</target>
+				</configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>