diff options
Diffstat (limited to 'cps-service')
5 files changed, 4 insertions, 15 deletions
diff --git a/cps-service/pom.xml b/cps-service/pom.xml index 3f5d639896..d4fe2e31aa 100644 --- a/cps-service/pom.xml +++ b/cps-service/pom.xml @@ -111,7 +111,6 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-cache</artifactId> - <version>3.0.0</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -125,12 +124,6 @@ <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> @@ -177,9 +170,5 @@ <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 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; |