Skip to content

Commit

Permalink
Merge pull request #101 from eu-digital-green-certificates/dependency…
Browse files Browse the repository at this point in the history
…-update

feat: Update Spring Boot to 3.0.7 and several dependency updates
  • Loading branch information
f11h authored Jun 19, 2023
2 parents 046831a + 25bf7bd commit dba6f2f
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ build/
/tools/*
!/tools/*.bat
!/tools/*.sh
pom.xml.versionsBackup
8 changes: 8 additions & 0 deletions owasp/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@
<notes>no YAML content from users is parsed within this service</notes>
<cve>CVE-2022-1471</cve>
</suppress>
<suppress>
<notes>False positive</notes>
<cve>CVE-2022-45688</cve>
</suppress>
<suppress>
<notes>No fix available, still analyzed</notes>
<cve>CVE-2023-35116</cve>
</suppress>
</suppressions>
45 changes: 34 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2022.0.1</version>
<version>2022.0.3</version>
<relativePath/>
</parent>

Expand All @@ -30,17 +29,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- dependencies -->

<owasp.version>8.0.2</owasp.version>
<bcpkix.version>1.72</bcpkix.version>
<lombok.version>1.18.24</lombok.version>
<mapstruct.version>1.5.3.Final</mapstruct.version>
<commonsio.version>2.11.0</commonsio.version>
<bcpkix.version>1.74</bcpkix.version>
<lombok.version>1.18.28</lombok.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<commonsio.version>2.13.0</commonsio.version>
<cbor.version>4.5.2</cbor.version>
<mockwebserver.version>4.10.0</mockwebserver.version>
<plugin.checkstyle.version>3.2.1</plugin.checkstyle.version>
<mockwebserver.version>5.0.0-alpha.11</mockwebserver.version>
<plugin.checkstyle.version>3.3.0</plugin.checkstyle.version>
<plugin.sonar.version>3.9.1.2184</plugin.sonar.version>
<plugin.surefire.version>3.0.0-M8</plugin.surefire.version>
<plugin.jacoco.version>0.8.8</plugin.jacoco.version>
<plugin.surefire.version>3.1.2</plugin.surefire.version>
<plugin.jacoco.version>0.8.10</plugin.jacoco.version>

<!-- license -->
<license.projectName>EU Digital Green Certificate Gateway Service / dgc-lib</license.projectName>
Expand Down Expand Up @@ -87,6 +87,17 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<exclusions>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
Expand Down Expand Up @@ -120,10 +131,22 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;

@AutoConfiguration
@ComponentScan("eu.europa.ec.dgc")
Expand Down

0 comments on commit dba6f2f

Please sign in to comment.