diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72ceb63..e1439fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: '11' - name: Build with Maven run: mvn -B package --file pom.xml - name: Codecov - uses: codecov/codecov-action@v1.3.1 + uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 646e616..23725d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,17 +19,17 @@ jobs: - name: Check out code uses: actions/checkout@v4 - - name: Set up JAVA 8 + - name: Set up JAVA 11 uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 11 distribution: "temurin" - name: Determine the version run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_OUTPUT id: versioncheck - - name: Exit when workflow_dispatch is triggered, and the version does not contain SNAPSHOT in it's name + - name: Exit when workflow_dispatch is triggered, and the version does not contain SNAPSHOT in the name run: | echo "Only SNAPSHOT releases can be triggered with the workflow_dispatch" exit 1 @@ -41,10 +41,10 @@ jobs: exit 1 if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name - - name: Set up JDK 8 for snapshots + - name: Set up JDK 11 for snapshots uses: actions/setup-java@v4 with: - java-version: "8" + java-version: "11" distribution: "temurin" cache: "maven" server-id: openconext-snapshots @@ -52,10 +52,10 @@ jobs: server-password: MAVEN_PASSWORD if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT')) - - name: Set up JDK 8 for releases + - name: Set up JDK 11 for releases uses: actions/setup-java@v4 with: - java-version: "8" + java-version: "11" distribution: "temurin" cache: "maven" server-id: openconext-releases @@ -103,7 +103,9 @@ jobs: labels: ${{ steps.meta.outputs.labels }} - name: Codecov - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: Create release uses: actions/create-release@v1 diff --git a/README.md b/README.md index becc4c5..6db43da 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ Mock implementation of the OOAPI for educational institutions. - Java 8 - Maven 3 +Set the JAVA_HOME property for maven (example for macOS): +``` +export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home/ +``` + ## [Building and running](#building-and-running) ### [The student-mobility-home-institution-mock-server](#student-mobility-home-institution-mock-server) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5ecaa92..3954ed2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:8-jdk-alpine +FROM eclipse-temurin:11-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/pom.xml b/pom.xml index 543a2f7..5cf3f83 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,23 @@ - + 4.0.0 org.springframework.boot spring-boot-starter-parent 2.4.0 - + + org.surfnet student-mobility-home-institution-mock - 0.2.12 + 0.2.13-SNAPSHOT home-institution-mock home-institution-mock - - 1.8 - 1.8 - 1.8 + 11 + 11 + 11 - org.springframework.boot @@ -55,8 +53,13 @@ org.bouncycastle - bcpkix-jdk15on - 1.66 + bcprov-jdk18on + 1.78.1 + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 com.github.spullara.mustache.java @@ -113,7 +116,6 @@ test - @@ -161,7 +163,6 @@ - openconext-releases @@ -174,5 +175,4 @@ dav:https://build.openconext.org/repository/public/snapshots -