diff options
author | Toine Siebelink <toine.siebelink@est.tech> | 2023-09-20 09:35:10 +0000 |
---|---|---|
committer | Toine Siebelink <toine.siebelink@est.tech> | 2023-09-20 12:48:19 +0000 |
commit | ad9b701a00c237ae8e462de76b500c8612866da6 (patch) | |
tree | 5f96ff03f2e4d5f3423c28bdffbfeb7c943cf924 /cps-service/src | |
parent | bba4d73e53cc79263fc162c4907facf43f13bdbf (diff) |
Revert "Migrate CPS to Spring-boot 3.0"
This reverts commit 9693ec51cf6526082f0ad0c3ad208d144cbbb163.
Reason for revert: Bug fix delivery
Change-Id: I73bdc1528192c662983b0bbef73b10b6d612a719
Signed-off-by: egernug <gerard.nugent@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Diffstat (limited to 'cps-service/src')
4 files changed, 4 insertions, 4 deletions
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 e0f8c97104..9327c53451 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 b8a7144b3d..3776a93d94 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 c29d042293..b9d40740e0 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,7 +21,6 @@ package org.onap.cps.notification; -import jakarta.annotation.PostConstruct; import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Collections; @@ -30,6 +29,7 @@ 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 5f5e4bc4ae..4eee7db136 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; |