Merge pull request #44 from admin-ch/feature/java-17

admin-ch · Dec 16, 2022 · 65dec78 · 65dec78
2 parents 8916af5 + 7056c70
commit 65dec78
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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'
@@ -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/ \

diff --git a/ch-covidcertificate-backend-verification-check/pom.xml b/ch-covidcertificate-backend-verification-check/pom.xml
@@ -18,13 +18,13 @@
 
     <properties>
         <java-version>11</java-version>
-        <kotlin.version>1.7.10</kotlin.version>
+        <kotlin.version>1.7.21</kotlin.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <spring-boot-version>2.7.3</spring-boot-version>
-        <spring-cloud-sleuth-version>3.1.3</spring-cloud-sleuth-version>
+        <spring-boot-version>2.7.5</spring-boot-version>
+        <spring-cloud-sleuth-version>3.1.5</spring-cloud-sleuth-version>
         <jackson-version>2.11.1</jackson-version>
         <spring-cloud-connectors-version>2.2.13.RELEASE</spring-cloud-connectors-version>
 
@@ -64,13 +64,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>ch.admin.bag.covidcertificate</groupId>
             <artifactId>cc-backend-logging</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <!-- LogBack dependencies -->
@@ -131,17 +131,17 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.9</version>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.moshi</groupId>
             <artifactId>moshi</artifactId>
-            <version>1.13.0</version>
+            <version>1.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.moshi</groupId>
             <artifactId>moshi-adapters</artifactId>
-            <version>1.13.0</version>
+            <version>1.14.0</version>
         </dependency>
     </dependencies>