From ad9b701a00c237ae8e462de76b500c8612866da6 Mon Sep 17 00:00:00 2001
From: Toine Siebelink <toine.siebelink@est.tech>
Date: Wed, 20 Sep 2023 09:35:10 +0000
Subject: 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>
---
 cps-rest/pom.xml                                                 | 9 ---------
 .../java/org/onap/cps/rest/controller/AdminRestController.java   | 4 ++--
 .../java/org/onap/cps/rest/controller/DataRestController.java    | 2 +-
 .../org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java    | 4 ++--
 4 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'cps-rest')

diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 5330b8633..8d92d972c 100755
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -122,14 +122,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -156,7 +148,6 @@
                                 <sourceFolder>src/gen/java</sourceFolder>
                                 <dateLibrary>java11</dateLibrary>
                                 <interfaceOnly>true</interfaceOnly>
-                                <useSpringBoot3>true</useSpringBoot3>
                                 <useTags>true</useTags>
                                 <openApiNullable>false</openApiNullable>
                                 <skipDefaultInterface>true</skipDefaultInterface>
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
index 993dad58c..369c94d29 100755
--- a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
@@ -27,11 +27,11 @@ import static org.onap.cps.rest.utils.MultipartFileUtil.extractYangResourcesMap;
 import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED;
 
 import io.micrometer.core.annotation.Timed;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.CpsAdminService;
 import org.onap.cps.api.CpsModuleService;
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
index 60e7fb6d2..62163327f 100755
--- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
@@ -25,13 +25,13 @@
 package org.onap.cps.rest.controller;
 
 import io.micrometer.core.annotation.Timed;
-import jakarta.validation.ValidationException;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import javax.validation.ValidationException;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.cps.api.CpsDataService;
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
index 1f6cf1724..5dfd03bf2 100755
--- a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
@@ -22,8 +22,8 @@
 
 package org.onap.cps.rest.exceptions;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ValidationException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ValidationException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-- 
cgit 1.2.3-korg