From a92fa97b726481cb23b55afb31ff66e91103daf0 Mon Sep 17 00:00:00 2001 From: Jochen Just Date: Tue, 16 May 2023 13:09:19 +0200 Subject: [PATCH] Uses Spring Boot 3.0.x --- README.md | 2 ++ build.gradle | 15 +++++++++------ .../de/novatec/baselining/BaseliningService.java | 2 +- .../java/de/novatec/baselining/InfluxAccess.java | 2 +- .../config/BaselineServiceSettings.java | 2 +- .../baselines/AbstractBaselineDefinition.java | 6 +++--- ...stractTaggedAggregatingBaselineDefinition.java | 6 +++--- .../baselines/CounterBaselineDefinition.java | 4 ++-- .../baselines/CounterRatioBaselineDefinition.java | 4 ++-- .../config/baselines/GaugeBaselineDefinition.java | 4 ++-- .../config/baselines/QueryBaselineDefinition.java | 2 +- .../config/measurement/MeasurementFieldName.java | 2 +- .../config/measurement/MeasurementName.java | 2 +- 13 files changed, 29 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index b42dc41..469ee31 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ This project is a standalone application which generates baselines on live and historical data stored in InfluxDB. The baselines are written back as series to Influx. +Since version 2.0 Java 17 is required. + ## Introduction Baselines are seasonality based: E.g. a daily baseline is computed by averaging the observed values from the past days at the same hour of the day. diff --git a/build.gradle b/build.gradle index 65eb9d2..d9f5122 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 "org.cyclonedx.bom" version "1.7.4" id "org.owasp.dependencycheck" version "8.2.1" @@ -7,8 +7,8 @@ plugins { apply plugin: 'io.spring.dependency-management' group 'de.novatec' -version '1.5' -sourceCompatibility = '1.8' +version '2.0' +sourceCompatibility = '17' repositories { mavenCentral() @@ -18,6 +18,12 @@ test { useJUnitPlatform() } +// 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" @@ -32,9 +38,6 @@ dependencies { "org.springframework.boot:spring-boot-starter-actuator", "org.hibernate.validator:hibernate-validator", "org.influxdb:influxdb-java", - // 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-math3:3.6.1", "org.apache.commons:commons-text:1.10.0" ) diff --git a/src/main/java/de/novatec/baselining/BaseliningService.java b/src/main/java/de/novatec/baselining/BaseliningService.java index d3b18f3..ae5f655 100644 --- a/src/main/java/de/novatec/baselining/BaseliningService.java +++ b/src/main/java/de/novatec/baselining/BaseliningService.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/de/novatec/baselining/InfluxAccess.java b/src/main/java/de/novatec/baselining/InfluxAccess.java index 29260be..ebd9b0f 100644 --- a/src/main/java/de/novatec/baselining/InfluxAccess.java +++ b/src/main/java/de/novatec/baselining/InfluxAccess.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/src/main/java/de/novatec/baselining/config/BaselineServiceSettings.java b/src/main/java/de/novatec/baselining/config/BaselineServiceSettings.java index ce34be0..76e4b60 100644 --- a/src/main/java/de/novatec/baselining/config/BaselineServiceSettings.java +++ b/src/main/java/de/novatec/baselining/config/BaselineServiceSettings.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.validation.annotation.Validated; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/novatec/baselining/config/baselines/AbstractBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/AbstractBaselineDefinition.java index 94bb105..efb6540 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/AbstractBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/AbstractBaselineDefinition.java @@ -5,9 +5,9 @@ import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.time.DurationMin; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; import java.time.Duration; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/novatec/baselining/config/baselines/AbstractTaggedAggregatingBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/AbstractTaggedAggregatingBaselineDefinition.java index ddb79e8..7615544 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/AbstractTaggedAggregatingBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/AbstractTaggedAggregatingBaselineDefinition.java @@ -5,9 +5,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Duration; import java.util.List; diff --git a/src/main/java/de/novatec/baselining/config/baselines/CounterBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/CounterBaselineDefinition.java index 7bbd160..37f0f3c 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/CounterBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/CounterBaselineDefinition.java @@ -5,8 +5,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.time.Duration; @Data diff --git a/src/main/java/de/novatec/baselining/config/baselines/CounterRatioBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/CounterRatioBaselineDefinition.java index f246c62..88dca05 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/CounterRatioBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/CounterRatioBaselineDefinition.java @@ -5,8 +5,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.time.Duration; @Data diff --git a/src/main/java/de/novatec/baselining/config/baselines/GaugeBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/GaugeBaselineDefinition.java index 392115f..fa6b7a2 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/GaugeBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/GaugeBaselineDefinition.java @@ -5,8 +5,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @Data() @NoArgsConstructor diff --git a/src/main/java/de/novatec/baselining/config/baselines/QueryBaselineDefinition.java b/src/main/java/de/novatec/baselining/config/baselines/QueryBaselineDefinition.java index 3b95c10..0f1de4f 100644 --- a/src/main/java/de/novatec/baselining/config/baselines/QueryBaselineDefinition.java +++ b/src/main/java/de/novatec/baselining/config/baselines/QueryBaselineDefinition.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data @AllArgsConstructor diff --git a/src/main/java/de/novatec/baselining/config/measurement/MeasurementFieldName.java b/src/main/java/de/novatec/baselining/config/measurement/MeasurementFieldName.java index 1171f1d..7eaf040 100644 --- a/src/main/java/de/novatec/baselining/config/measurement/MeasurementFieldName.java +++ b/src/main/java/de/novatec/baselining/config/measurement/MeasurementFieldName.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data @NoArgsConstructor diff --git a/src/main/java/de/novatec/baselining/config/measurement/MeasurementName.java b/src/main/java/de/novatec/baselining/config/measurement/MeasurementName.java index 2624b46..b8ad61f 100644 --- a/src/main/java/de/novatec/baselining/config/measurement/MeasurementName.java +++ b/src/main/java/de/novatec/baselining/config/measurement/MeasurementName.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data @NoArgsConstructor