summaryrefslogtreecommitdiffstats
path: root/cps-service
diff options
context:
space:
mode:
authoregernug <gerard.nugent@est.tech>2023-09-21 17:51:21 +0100
committeregernug <gerard.nugent@est.tech>2023-09-22 11:20:05 +0100
commit477bd46874d2c8266007358f9ca335b0442cea18 (patch)
treeb5e4e88655f1d84eca7c6d14bd14962b1ad4e845 /cps-service
parent0af82141cb75a04a16248e17d4e915a580e82300 (diff)
Reinstate Spring Boot 3.0 after revert
Issue-ID: CPS-1789 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: Iee5c514ccdba36a387f83948d8a3ba26e6b1de5b
Diffstat (limited to 'cps-service')
-rw-r--r--cps-service/pom.xml10
-rw-r--r--cps-service/src/main/java/org/onap/cps/config/AsyncConfig.java2
-rw-r--r--cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java2
-rw-r--r--cps-service/src/main/java/org/onap/cps/notification/NotificationService.java2
-rw-r--r--cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java2
5 files changed, 14 insertions, 4 deletions
diff --git a/cps-service/pom.xml b/cps-service/pom.xml
index 59428cdfdf..4a3c90e41f 100644
--- a/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@ -111,6 +111,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -124,6 +125,11 @@
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- T E S T D E P E N D E N C I E S -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -170,5 +176,9 @@
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/cps-service/src/main/java/org/onap/cps/config/AsyncConfig.java b/cps-service/src/main/java/org/onap/cps/config/AsyncConfig.java
index 9327c53451..e0f8c97104 100644
--- a/cps-service/src/main/java/org/onap/cps/config/AsyncConfig.java
+++ b/cps-service/src/main/java/org/onap/cps/config/AsyncConfig.java
@@ -21,8 +21,8 @@
package org.onap.cps.config;
+import jakarta.validation.constraints.Min;
import java.util.concurrent.ThreadPoolExecutor;
-import javax.validation.constraints.Min;
import lombok.Setter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java b/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java
index 3776a93d94..b8a7144b3d 100644
--- a/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java
+++ b/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java
@@ -19,9 +19,9 @@
package org.onap.cps.notification;
+import jakarta.validation.constraints.NotNull;
import java.util.Collections;
import java.util.Map;
-import javax.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java b/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java
index b9d40740e0..c29d042293 100644
--- a/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java
+++ b/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java
@@ -21,6 +21,7 @@
package org.onap.cps.notification;
+import jakarta.annotation.PostConstruct;
import java.time.OffsetDateTime;
import java.util.Arrays;
import java.util.Collections;
@@ -29,7 +30,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.onap.cps.api.CpsAdminService;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java b/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java
index 4eee7db136..5f5e4bc4ae 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java
@@ -22,10 +22,10 @@ package org.onap.cps.spi.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.Valid;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.validation.Valid;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;