From 5f6e9a3e5ccf97928e500a88de601c5b1e76b9db Mon Sep 17 00:00:00 2001
From: rajeevme <rajeev.mehta@amdocs.com>
Date: Wed, 4 Mar 2020 14:46:09 +0530
Subject: [PATCH] [AAI-2537] [search-data-service] Update to springboot 2

Issue-ID: AAI-2537

Change-Id: Ie4f0bb095e0d22dfab7175f76920185ff871d27a

Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
Change-Id: Iea035588dc93804ded48ef4d6b0c5f4f6b774ada
---
 search-data-service-app/pom.xml                                       | 4 ++--
 .../src/main/java/org/onap/aai/sa/Application.java                    | 2 +-
 .../src/test/java/org/onap/aai/sa/rest/BulkApiTest.java               | 2 +-
 .../src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java           | 2 +-
 .../src/test/java/org/onap/aai/sa/rest/IndexApiTest.java              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index e00a0dd..b238d06 100644
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -52,7 +52,7 @@
         <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
         <jacoco.line.coverage.limit>0.58</jacoco.line.coverage.limit>
-        <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.12.RELEASE</spring.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.7.8</version>
+            <!--<version>2.7.8</version>-->
         </dependency>
 
         <dependency>
diff --git a/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java b/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java
index ad52dfd..70c1984 100644
--- a/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import org.eclipse.jetty.util.security.Password;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
diff --git a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
index fcc5b77..d8f926a 100644
--- a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
@@ -40,7 +40,7 @@ import org.springframework.test.web.servlet.MockMvc;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = org.onap.aai.sa.Application.class)
-@AutoConfigureMockMvc
+@AutoConfigureMockMvc(addFilters = false)
 public class BulkApiTest {
 
     private final String TOP_URI = "/test/bulk";
diff --git a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
index 865f981..214d451 100644
--- a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
@@ -43,7 +43,7 @@ import org.springframework.test.web.servlet.MvcResult;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@AutoConfigureMockMvc
+@AutoConfigureMockMvc(addFilters = false)
 public class DocumentApiTest {
 
     private static final String INDEXES_URI = "/test/indexes/";
diff --git a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
index ed84a7a..c90b989 100644
--- a/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
@@ -55,7 +55,7 @@ import org.springframework.test.web.servlet.MvcResult;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@AutoConfigureMockMvc
+@AutoConfigureMockMvc(addFilters = false)
 public class IndexApiTest {
 
     private final String TOP_URI = "/test/indexes/";
-- 
2.16.6