Merge pull request #70 from SURFnet/feature/jdk21

Feature/jdk21
SURFnet · Dec 3, 2024 · bd8f5b0 · bd8f5b0
2 parents 77dffd3 + 03afe16
commit bd8f5b0
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        distribution: 'temurin' # See 'Supported distributions' for available options
+        java-version: '21'
     - name: Set up MySQL
       uses: shogo82148/actions-setup-mysql@v1
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,10 +21,10 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: "temurin"
 
       - name: Determine the version
@@ -43,21 +43,21 @@ jobs:
           exit 1
         if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name
 
-      - name: Set up JDK 1.8 for snapshots
+      - name: Set up JDK 21 for snapshots
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          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 1.8
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-releases

diff --git a/client/package.json b/client/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@lottiefiles/svelte-lottie-player": "^0.1.4",
-    "dompurify": "^2.4.0",
+    "dompurify": "^3.1.7",
     "i18n-js": "^3.3.0",
     "isomorphic-fetch": "^3.0.0",
     "js-cookie": "^2.2.1",

diff --git a/client/pom.xml b/client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.surfnet</groupId>
         <artifactId>student-mobility-broker</artifactId>
-        <version>0.2.14</version>
+        <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>student-mobility-broker-client</artifactId>
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.4.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -2923,10 +2923,10 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-dompurify@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
-  integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
+dompurify@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
+  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
 
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"

diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.surfnet</groupId>
     <artifactId>student-mobility-broker</artifactId>
-    <version>0.2.14</version>
+    <version>0.3.0-SNAPSHOT</version>
     <name>student-mobility-broker</name>
     <description>student-mobility-broker-app</description>
     <packaging>pom</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.6</version>
+        <version>2.7.16</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>
@@ -23,14 +23,22 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-webdav-jackrabbit</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.3</version>
             </extension>
         </extensions>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <release>21</release>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>
@@ -39,8 +47,11 @@
                         </goals>
                         <configuration>
                             <rules>
+                                <requireMavenVersion>
+                                    <version>3.8.4</version>
+                                </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[1.8.0-0,1.8.0-500]</version>
+                                    <version>21</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

diff --git a/server/docker/Dockerfile b/server/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 RUN apk --update upgrade && apk add openssl openssl-dev ca-certificates libgcc && update-ca-certificates
 COPY target/*.jar app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/server/pom.xml b/server/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.surfnet</groupId>
         <artifactId>student-mobility-broker</artifactId>
-        <version>0.2.14</version>
+        <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>student-mobility-broker-server</artifactId>
     <packaging>jar</packaging>
     <name>student-mobility-broker-server</name>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -94,15 +94,46 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <release>21</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.8.4</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>21</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>4.9.10</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <goals>