diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c32758d..e42864d 100644 --- 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 index dca1219..e61e7b0 100644 --- 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,10 +43,10 @@ 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 @@ -54,10 +54,10 @@ jobs: 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 index 78aa467..d1075ae 100644 --- 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 index 610e1c0..2ed3368 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.surfnet student-mobility-broker - 0.2.14 + 0.3.0-SNAPSHOT ../pom.xml student-mobility-broker-client @@ -15,7 +15,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.1.0 diff --git a/client/yarn.lock b/client/yarn.lock index d3b682e..aba2392 100644 --- 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 index 170b510..6b6e65c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.surfnet student-mobility-broker - 0.2.14 + 0.3.0-SNAPSHOT student-mobility-broker student-mobility-broker-app pom org.springframework.boot spring-boot-starter-parent - 2.7.6 + 2.7.16 @@ -23,14 +23,22 @@ org.apache.maven.wagon wagon-webdav-jackrabbit - 3.4.1 + 3.5.3 + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 21 + + org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.5.0 enforce-versions @@ -39,8 +47,11 @@ + + 3.8.4 + - [1.8.0-0,1.8.0-500] + 21 diff --git a/server/docker/Dockerfile b/server/docker/Dockerfile index 5ecaa92..fd7900b 100644 --- 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 index 086898f..c383eb2 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,14 +4,14 @@ org.surfnet student-mobility-broker - 0.2.14 + 0.3.0-SNAPSHOT ../pom.xml student-mobility-broker-server jar student-mobility-broker-server - 1.8 + 21 @@ -94,15 +94,46 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 21 + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-versions + + enforce + + + + + 3.8.4 + + + 21 + + + + + + pl.project13.maven git-commit-id-plugin - 4.0.0 + 4.9.10 org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.12