diff --git a/.gitignore b/.gitignore index 6f2dcc0..1af24cc 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ build/ /tools/* !/tools/*.bat !/tools/*.sh +pom.xml.versionsBackup diff --git a/owasp/suppressions.xml b/owasp/suppressions.xml index 3fd8b02..5ff56ad 100644 --- a/owasp/suppressions.xml +++ b/owasp/suppressions.xml @@ -4,4 +4,12 @@ no YAML content from users is parsed within this service CVE-2022-1471 + + False positive + CVE-2022-45688 + + + No fix available, still analyzed + CVE-2023-35116 + diff --git a/pom.xml b/pom.xml index 9270a25..77878df 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,12 @@ + 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"> 4.0.0 org.springframework.cloud spring-cloud-starter-parent - 2022.0.1 + 2022.0.3 @@ -30,17 +29,18 @@ UTF-8 UTF-8 + 8.0.2 - 1.72 - 1.18.24 - 1.5.3.Final - 2.11.0 + 1.74 + 1.18.28 + 1.5.5.Final + 2.13.0 4.5.2 - 4.10.0 - 3.2.1 + 5.0.0-alpha.11 + 3.3.0 3.9.1.2184 - 3.0.0-M8 - 0.8.8 + 3.1.2 + 0.8.10 EU Digital Green Certificate Gateway Service / dgc-lib @@ -87,6 +87,17 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + commons-fileupload + commons-fileupload + + + + + commons-fileupload + commons-fileupload + 1.5 io.github.openfeign @@ -120,10 +131,22 @@ com.fasterxml.jackson.core jackson-databind + 2.15.2 + + + com.fasterxml.jackson.core + jackson-core + 2.15.2 com.fasterxml.jackson.datatype jackson-datatype-jsr310 + 2.15.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.15.2 org.springframework.boot diff --git a/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java b/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java index 605ea32..f410a36 100644 --- a/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java +++ b/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java @@ -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")