From 832defad49e239382220b57f1c253a263d2ff631 Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Mon, 28 Oct 2024 11:18:52 +0100
Subject: [PATCH] Miigrated to JDK21

---
 .github/workflows/deploy.yml | 12 ++++++------
 .github/workflows/maven.yml  |  8 ++++----
 README.md                    |  4 ++--
 docker/Dockerfile            |  2 +-
 pom.xml                      | 21 +++++++++++----------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8927351..820ff35 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: "temurin"
           server-id: openconext-releases
           server-username: MAVEN_USERNAME
@@ -50,10 +50,10 @@ jobs:
           exit 1
         if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name
 
-      - name: Set up JDK 11 for snapshots
+      - name: Set up JDK 21 for snapshots
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-snapshots
@@ -61,10 +61,10 @@ jobs:
           server-password: MAVEN_PASSWORD
         if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT'))
 
-      - name: Set up JDK 11 for releases
+      - name: Set up JDK 21 for releases
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-releases
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 455e53b..21d08d3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,19 +5,19 @@ name: CI Github
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'adopt'
         cache: 'maven'
     - name: Build with Maven
diff --git a/README.md b/README.md
index af089a6..10e2234 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ grant all on grouper_local.* to 'root'@'localhost';
 ```
 
 # Getting started
-This project uses Spring Boot and Maven and JDK11. Install JDK11 and point your `JAVA_HOME` to this directory:
+This project uses Spring Boot and Maven and JDK21. Install JDK21 and point your `JAVA_HOME` to this directory:
 
-`export JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-11.jdk/Contents/Home/`
+`export JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home/`
 
 To run locally, type:
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ff6b098..daf2c3a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 COPY target/*.jar app.jar
 EXPOSE 8080
 ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/pom.xml b/pom.xml
index 1dacf3b..d20416f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>voot-service</artifactId>
-  <version>6.2.0</version>
+  <version>7.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>voot-service</name>
@@ -15,13 +15,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.17</version>
+    <version>2.7.18</version>
     <relativePath />
   </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <java.version>21</java.version>
   </properties>
 
   <scm>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>3.0.3</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -135,19 +135,20 @@
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
+        <version>4.9.10</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.13.0</version>
         <configuration>
-          <release>11</release>
+          <release>21</release>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.7</version>
+        <version>0.8.12</version>
         <executions>
           <execution>
             <goals>
@@ -166,7 +167,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>enforce-versions</id>
@@ -179,7 +180,7 @@
                   <version>3.8.4</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>11</version>
+                  <version>21</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -191,7 +192,7 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-webdav-jackrabbit</artifactId>
-        <version>3.5.1</version>
+        <version>3.5.3</version>
       </extension>
     </extensions>
   </build>