From cb0e89b58ba97d6d1a72b5224335c4dbcd28857b Mon Sep 17 00:00:00 2001 From: Peter Havekes Date: Tue, 14 May 2024 14:50:53 +0200 Subject: [PATCH] JAVA 11 --- .github/workflows/build.yml | 11 ++++++----- .github/workflows/release.yml | 14 +++++++------- docker/Dockerfile | 2 +- pom.xml | 6 +++--- src/main/resources/application.yml | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72ceb63..5ee9988 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,13 @@ 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 646e616..e257c89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,14 +22,14 @@ jobs: - name: Set up JAVA 8 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,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} - name: Codecov - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4 - name: Create release uses: actions/create-release@v1 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 e3ffcd7..3b96edf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ home-institution-mock - 1.8 - 1.8 - 1.8 + 11 + 11 + 11 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7494605..8f489ac 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ logging: level: root: warn home: debug - org.springframework: trace + org.springframework: info delay: enabled: true