Upgrade to JDK21 #632

OpenConext · Oct 25, 2024 · 9487b55 · 9487b55
1 parent cea0650
commit 9487b55
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -29,10 +29,10 @@ jobs:
       uses: supercharge/mongodb-github-action@1.3.0
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
-    - name: Set up JDK 11
+    - name: Set up JDK 12
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 12
         distribution: 'temurin'
         cache: 'maven'
     - name: Set up cache

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,10 +21,10 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 16
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 21
         distribution: 'temurin'
         cache: 'maven'
         server-id: openconext-releases
@@ -54,21 +54,21 @@ 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
         server-username: MAVEN_USERNAME
         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/myconext-server/pom.xml b/myconext-server/pom.xml
@@ -12,7 +12,7 @@
     <name>myconext-server</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -106,6 +106,11 @@
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>jakarta.mail</groupId>-->
+<!--            <artifactId>jakarta.mail-api</artifactId>-->
+<!--            <version>2.1.3</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
@@ -193,7 +198,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.5</version>
+            <version>1.6.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.tomakehurst/wiremock -->
@@ -206,7 +211,7 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>4.1.1</version>
+            <version>4.2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -251,7 +256,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.9.0</version>
+                <version>2.12.0</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,13 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>11</release>
+                    <release>21</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>
@@ -46,7 +46,7 @@
                                     <version>3.8.4</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>11</version>
+                                    <version>21</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

diff --git a/tiqr-mock/pom.xml b/tiqr-mock/pom.xml
@@ -12,7 +12,7 @@
     <name>tiqr-mock</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencies>
         <dependency>