From abedf686cf078fd87d662b8063b22be278c8c59d Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Mon, 28 Oct 2024 13:12:54 +0100
Subject: [PATCH] Upped JDK to 21

---
 .github/workflows/deploy.yml | 10 +++++-----
 .github/workflows/maven.yml  |  8 ++++----
 README.md                    |  4 ++--
 mujina-common/pom.xml        |  4 ++--
 mujina-idp/docker/Dockerfile |  2 +-
 mujina-idp/pom.xml           |  6 +++---
 mujina-sp/docker/Dockerfile  |  2 +-
 mujina-sp/pom.xml            |  6 +++---
 pom.xml                      | 18 +++++++++---------
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e45c02a4..87445eb0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: "temurin"
           server-id: openconext-releases
           server-username: MAVEN_USERNAME
@@ -51,10 +51,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
@@ -62,10 +62,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 5ccc3822..9ef5be43 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: CI Github
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -16,10 +16,10 @@ jobs:
 
     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 37e63d6e..ce2e558c 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ then the following has changed:
 * We no longer use Tomcat, but standalone Spring boot applications
 * The API has changed for all end-points requiring a single value (e.g. String or boolean) and only that value is required in the request body. See the API documentation below.
 
-As of version 8.0.0 we run with Java 11.
+As of version 9.0.0 we run with Java 21.
 
 Characteristics of both the IdP or SP can be runtime changed with the REST API.
 
@@ -80,7 +80,7 @@ After you override configuration you can go back to the default using the reset
 Build Mujina
 ---------------
 
-[Maven 3](http://maven.apache.org) in combination with Java 11 is needed to build and run Mujina.
+[Maven 3](http://maven.apache.org) in combination with Java 21 is needed to build and run Mujina.
 
 ```bash
 git clone git@github.com:OpenConext/Mujina.git
diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml
index 8dd80f7f..5ee03286 100644
--- a/mujina-common/pom.xml
+++ b/mujina-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.12</version>
+        <version>9.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mujina-idp/docker/Dockerfile b/mujina-idp/docker/Dockerfile
index 6db5b001..d05aa427 100644
--- a/mujina-idp/docker/Dockerfile
+++ b/mujina-idp/docker/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:11-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 COPY target/*.jar app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml
index 92cd430b..56fc11f1 100644
--- a/mujina-idp/pom.xml
+++ b/mujina-idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.12</version>
+        <version>9.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.6.3</version>
+                <version>2.7.18</version>
             </plugin>
         </plugins>
     </build>
diff --git a/mujina-sp/docker/Dockerfile b/mujina-sp/docker/Dockerfile
index 6db5b001..d05aa427 100644
--- a/mujina-sp/docker/Dockerfile
+++ b/mujina-sp/docker/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:11-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 COPY target/*.jar app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml
index 1cd7f81a..9542c632 100644
--- a/mujina-sp/pom.xml
+++ b/mujina-sp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.12</version>
+        <version>9.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.6.3</version>
+                <version>2.7.18</version>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 9db11765..c9839576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,18 +20,18 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>mujina</artifactId>
-  <version>8.0.12</version>
+  <version>9.0.0</version>
   <packaging>pom</packaging>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.6.3</version>
+    <version>2.7.18</version>
   </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <java.version>21</java.version>
   </properties>
 
   <modules>
@@ -63,15 +63,15 @@
       <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>
@@ -90,7 +90,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>
@@ -103,7 +103,7 @@
                   <version>3.8.4</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>11</version>
+                  <version>21</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -115,7 +115,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>