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 @@ org.openconext voot-service - 6.2.0 + 7.0.0-SNAPSHOT jar voot-service @@ -15,13 +15,13 @@ org.springframework.boot spring-boot-starter-parent - 2.7.17 + 2.7.18 UTF-8 - 11 + 21 @@ -77,7 +77,7 @@ org.mariadb.jdbc mariadb-java-client - 3.0.3 + 3.4.1 org.apache.commons @@ -135,19 +135,20 @@ pl.project13.maven git-commit-id-plugin + 4.9.10 org.apache.maven.plugins maven-compiler-plugin - 3.9.0 + 3.13.0 - 11 + 21 org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.12 @@ -166,7 +167,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.5.0 enforce-versions @@ -179,7 +180,7 @@ 3.8.4 - 11 + 21 @@ -191,7 +192,7 @@ org.apache.maven.wagon wagon-webdav-jackrabbit - 3.5.1 + 3.5.3