diff --git a/build.gradle b/build.gradle index 8081b76..5328140 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.7.11' + id 'org.springframework.boot' version '3.0.6' id 'java' id 'idea' id "org.cyclonedx.bom" version "1.7.4" @@ -9,14 +9,21 @@ plugins { apply plugin: 'io.spring.dependency-management' group = 'de.novatec' -version = '1.7' +version = '2.0' -sourceCompatibility = '1.8' +sourceCompatibility = '17' repositories { mavenCentral() } + +// We only use snakeyaml transitively, but we want to force the +// current version due to existing CVEs. +// According to https://github.com/spring-projects/spring-boot/issues/34405 +// this is a safe +ext['snakeyaml.version'] = '2.0' + dependencies { annotationProcessor( "org.projectlombok:lombok" @@ -31,10 +38,6 @@ dependencies { 'org.springframework.boot:spring-boot-starter-actuator', 'org.springframework.boot:spring-boot-starter-validation', - // We only use snakeyaml transitively, but we want to force the - // current version due to existing CVEs. - 'org.yaml:snakeyaml:2.0', - 'org.apache.commons:commons-text:1.10.0', 'org.influxdb:influxdb-java' ) diff --git a/src/main/java/de/novatec/dwhexport/configuration/model/DwhExporterSettings.java b/src/main/java/de/novatec/dwhexport/configuration/model/DwhExporterSettings.java index 3a3beda..ffeb6c4 100755 --- a/src/main/java/de/novatec/dwhexport/configuration/model/DwhExporterSettings.java +++ b/src/main/java/de/novatec/dwhexport/configuration/model/DwhExporterSettings.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.validation.annotation.Validated; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; @Data diff --git a/src/main/java/de/novatec/dwhexport/configuration/model/MetricQuery.java b/src/main/java/de/novatec/dwhexport/configuration/model/MetricQuery.java index faec7bb..3984ea2 100755 --- a/src/main/java/de/novatec/dwhexport/configuration/model/MetricQuery.java +++ b/src/main/java/de/novatec/dwhexport/configuration/model/MetricQuery.java @@ -2,7 +2,7 @@ import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data public class MetricQuery {