From bb40546dbb3ee32c3ec3dcbb390ce7d4318f9cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20B=C3=A4umer?= <fabian.baeumer@rub.de>
Date: Fri, 23 Feb 2024 11:10:50 +0100
Subject: [PATCH 1/2] build: Switch to Java 21

---
 Jenkinsfile | 4 ++--
 pom.xml     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7296772..579eb5a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,8 +2,8 @@ pipeline {
     agent any
 
     environment {
-        JDK_TOOL_NAME = 'JDK 11'
-        MAVEN_TOOL_NAME = 'Maven 3.8.6'
+        JDK_TOOL_NAME = 'JDK 21'
+        MAVEN_TOOL_NAME = 'Maven 3.9.6'
     }
 
     options {
diff --git a/pom.xml b/pom.xml
index 0e2de05..3fbb940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!-- The following variables are required for Jenkins CI -->
         <skipTests>false</skipTests>
         <skip.surefire.tests>${skipTests}</skip.surefire.tests>
@@ -115,7 +115,7 @@
                             <spacesPerTab>4</spacesPerTab>
                         </indent>
                         <googleJavaFormat>
-                            <version>1.16.0</version>
+                            <version>1.20.0</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <licenseHeader>

From bb95e99c7505f6968092c8ad6e8adabbeaac0cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20B=C3=A4umer?= <fabian.baeumer@rub.de>
Date: Fri, 23 Feb 2024 12:11:09 +0100
Subject: [PATCH 2/2] ci: Temporarily deactivate PMD

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 579eb5a..dd81bce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,7 +58,8 @@ pipeline {
             }
             steps {
                 withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {
-                    sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'
+//                    sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'
+                    sh 'mvn spotbugs:spotbugs'
                 }
             }
             post {