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

Commit

Permalink
Merge pull request #25 from admin-ch/feature/VACCINECER-2333-upgrade-…
Browse files Browse the repository at this point in the history
…spring-boot-27x

Feature/vaccinecer 2333 upgrade spring boot 27x
  • Loading branch information
Armin-Isenring-Bit authored Nov 28, 2022
2 parents a776137 + d1abc5f commit 7a39aba
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- 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@v1
with:
java-version: 11.0.7
java-version: 17.0.4

- name: Cache local Maven repository
uses: actions/cache@v2
Expand Down
25 changes: 21 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.10</version>
<version>2.7.5</version>
<relativePath/>
</parent>
<groupId>ch.admin.bag.covidcertificate</groupId>
<artifactId>cc-light-certificate-generation-service</artifactId>
<version>2.16.0</version>
<version>4.9.0</version>
<name>cc-light-certificate-generation-service</name>
<description>Service for generating a light covid certificate</description>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>

<cc-backend-logging.version>1.0.4</cc-backend-logging.version>
<dgc-java.version>1.0.2</dgc-java.version>
Expand All @@ -28,7 +28,8 @@
<spring-cloud-starter-sleuth.version>3.1.4</spring-cloud-starter-sleuth.version>
<spring-cloud.version>2021.0.4</spring-cloud.version>
<springdoc.version>1.6.11</springdoc.version>

<java-cfenv-boot.version>2.4.0</java-cfenv-boot.version>

<maven.javadoc.skip>true</maven.javadoc.skip>
<log4j2.version>2.18.0</log4j2.version>

Expand Down Expand Up @@ -82,6 +83,22 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>${java-cfenv-boot.version}</version>
<exclusions>
<!-- Avoid versions from java-cfenv-boot / java-cfenv-jdbc leaking into starters -->
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Swedish -->
<dependency>
Expand Down

0 comments on commit 7a39aba

Please sign in to comment.