diff --git a/.github/workflows/.trivyignore b/.github/workflows/.trivyignore index e69de29..b069b15 100644 --- a/.github/workflows/.trivyignore +++ b/.github/workflows/.trivyignore @@ -0,0 +1,10 @@ +# Nov 22 +# Netty issue. Wait for Spring to fix +CVE-2023-34062 + +# Nov 22 +# OpenSSL Issues - need to upgrade alpine +CVE-2023-5363 +CVE-2023-5678 +CVE-2023-5363 +CVE-2023-5678 \ No newline at end of file diff --git a/pom.xml b/pom.xml index a0c32ad..8caad70 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.1.5 eu.dissco.core diff --git a/src/main/java/eu/dissco/core/translator/properties/DwcaProperties.java b/src/main/java/eu/dissco/core/translator/properties/DwcaProperties.java index 766721a..debf618 100644 --- a/src/main/java/eu/dissco/core/translator/properties/DwcaProperties.java +++ b/src/main/java/eu/dissco/core/translator/properties/DwcaProperties.java @@ -1,7 +1,7 @@ package eu.dissco.core.translator.properties; import eu.dissco.core.translator.Profiles; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/eu/dissco/core/translator/properties/FdoProperties.java b/src/main/java/eu/dissco/core/translator/properties/FdoProperties.java index 2130e92..632dc7f 100644 --- a/src/main/java/eu/dissco/core/translator/properties/FdoProperties.java +++ b/src/main/java/eu/dissco/core/translator/properties/FdoProperties.java @@ -1,6 +1,6 @@ package eu.dissco.core.translator.properties; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/eu/dissco/core/translator/properties/KafkaProperties.java b/src/main/java/eu/dissco/core/translator/properties/KafkaProperties.java index d14e6a2..49aefd3 100644 --- a/src/main/java/eu/dissco/core/translator/properties/KafkaProperties.java +++ b/src/main/java/eu/dissco/core/translator/properties/KafkaProperties.java @@ -1,7 +1,7 @@ package eu.dissco.core.translator.properties; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/eu/dissco/core/translator/properties/WebClientProperties.java b/src/main/java/eu/dissco/core/translator/properties/WebClientProperties.java index 4d5faea..bab81b9 100644 --- a/src/main/java/eu/dissco/core/translator/properties/WebClientProperties.java +++ b/src/main/java/eu/dissco/core/translator/properties/WebClientProperties.java @@ -1,6 +1,6 @@ package eu.dissco.core.translator.properties; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated;