Skip to content
This repository was archived by the owner on Sep 15, 2023. It is now read-only.

Commit 65dec78

Browse files
authored
Merge pull request #44 from admin-ch/feature/java-17
2 parents 8916af5 + 7056c70 commit 65dec78

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- uses: actions/checkout@v3
1313
with:
1414
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v3
1717
with:
18-
java-version: 11
18+
java-version: 17
1919
distribution: 'zulu'
2020
- name: Cache SonarCloud packages
2121
uses: actions/cache@v3

.github/workflows/tagged_release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- uses: actions/checkout@v3
1414
- run: |
1515
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
16-
- name: Set up JDK 11
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: 11.0.7
19+
java-version: 17
2020
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2121
settings-path: ${{ github.workspace }} # location for the settings.xml file: :
2222
distribution: 'zulu'
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
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 \
5959
-Dimage=${{ secrets.DOCKER_HUB_USERNAME}}/${{ env.APP_NAME }} \
60-
-Djib.from.image=adoptopenjdk:11-jre \
60+
-Djib.from.image=eclipse-temurin:17 \
6161
-Djib.to.auth.username=${{ secrets.DOCKER_HUB_USERNAME }} \
6262
-Djib.to.auth.password=${{ secrets.DOCKER_HUB }} \
6363
-Djib.container.volumes=/config/ \

ch-covidcertificate-backend-verification-check/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
<properties>
2020
<java-version>11</java-version>
21-
<kotlin.version>1.7.10</kotlin.version>
21+
<kotlin.version>1.7.21</kotlin.version>
2222

2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525

26-
<spring-boot-version>2.7.3</spring-boot-version>
27-
<spring-cloud-sleuth-version>3.1.3</spring-cloud-sleuth-version>
26+
<spring-boot-version>2.7.5</spring-boot-version>
27+
<spring-cloud-sleuth-version>3.1.5</spring-cloud-sleuth-version>
2828
<jackson-version>2.11.1</jackson-version>
2929
<spring-cloud-connectors-version>2.2.13.RELEASE</spring-cloud-connectors-version>
3030

@@ -64,13 +64,13 @@
6464
<dependency>
6565
<groupId>org.junit.jupiter</groupId>
6666
<artifactId>junit-jupiter-api</artifactId>
67-
<version>5.9.0</version>
67+
<version>5.9.1</version>
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.junit.jupiter</groupId>
7272
<artifactId>junit-jupiter-engine</artifactId>
73-
<version>5.9.0</version>
73+
<version>5.9.1</version>
7474
<scope>test</scope>
7575
</dependency>
7676

@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>ch.admin.bag.covidcertificate</groupId>
9292
<artifactId>cc-backend-logging</artifactId>
93-
<version>1.0.3</version>
93+
<version>1.0.4</version>
9494
</dependency>
9595

9696
<!-- LogBack dependencies -->
@@ -131,17 +131,17 @@
131131
<dependency>
132132
<groupId>org.apache.commons</groupId>
133133
<artifactId>commons-text</artifactId>
134-
<version>1.9</version>
134+
<version>1.10.0</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.squareup.moshi</groupId>
138138
<artifactId>moshi</artifactId>
139-
<version>1.13.0</version>
139+
<version>1.14.0</version>
140140
</dependency>
141141
<dependency>
142142
<groupId>com.squareup.moshi</groupId>
143143
<artifactId>moshi-adapters</artifactId>
144-
<version>1.13.0</version>
144+
<version>1.14.0</version>
145145
</dependency>
146146
</dependencies>
147147

0 commit comments

Comments
 (0)