From 4279630dbffeb7ac0e84f9ed4763c98c32e6819b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:12:29 +0000 Subject: [PATCH 1/3] fix(deps): update dependencies --- .../pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ch-covidcertificate-backend-verification-check/pom.xml b/ch-covidcertificate-backend-verification-check/pom.xml index 9ac9fb6..aece515 100644 --- a/ch-covidcertificate-backend-verification-check/pom.xml +++ b/ch-covidcertificate-backend-verification-check/pom.xml @@ -18,13 +18,13 @@ 11 - 1.7.10 + 1.7.21 UTF-8 UTF-8 - 2.7.3 - 3.1.3 + 2.7.5 + 3.1.5 2.11.1 2.2.13.RELEASE @@ -64,13 +64,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.0 + 5.9.1 test org.junit.jupiter junit-jupiter-engine - 5.9.0 + 5.9.1 test @@ -90,7 +90,7 @@ ch.admin.bag.covidcertificate cc-backend-logging - 1.0.3 + 1.0.4 @@ -131,17 +131,17 @@ org.apache.commons commons-text - 1.9 + 1.10.0 com.squareup.moshi moshi - 1.13.0 + 1.14.0 com.squareup.moshi moshi-adapters - 1.13.0 + 1.14.0 From 02758ed63594516b7e1f71c14ff63bf3cfc8be6e Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Tue, 29 Nov 2022 10:39:59 +0100 Subject: [PATCH 2/3] Update workflows for Java 17 --- .github/workflows/build.yml | 4 ++-- .github/workflows/tagged_release.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 908486d..84ed1bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Cache SonarCloud packages uses: actions/cache@v3 diff --git a/.github/workflows/tagged_release.yaml b/.github/workflows/tagged_release.yaml index fa5d7f2..c0e045a 100644 --- a/.github/workflows/tagged_release.yaml +++ b/.github/workflows/tagged_release.yaml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v3 - run: | git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 11.0.7 + java-version: 17 server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file: : distribution: 'zulu' From 7056c70c9646752887c1591f0a55a256ec42daa3 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Tue, 29 Nov 2022 10:43:40 +0100 Subject: [PATCH 3/3] Change Docker base image to Temurin 17 --- .github/workflows/tagged_release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tagged_release.yaml b/.github/workflows/tagged_release.yaml index c0e045a..f7a5ca0 100644 --- a/.github/workflows/tagged_release.yaml +++ b/.github/workflows/tagged_release.yaml @@ -57,7 +57,7 @@ jobs: run: | mvn --batch-mode compile com.google.cloud.tools:jib-maven-plugin:3.1.4:build -f ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/pom.xml \ -Dimage=${{ secrets.DOCKER_HUB_USERNAME}}/${{ env.APP_NAME }} \ - -Djib.from.image=adoptopenjdk:11-jre \ + -Djib.from.image=eclipse-temurin:17 \ -Djib.to.auth.username=${{ secrets.DOCKER_HUB_USERNAME }} \ -Djib.to.auth.password=${{ secrets.DOCKER_HUB }} \ -Djib.container.volumes=/config/ \