From e0cf0c1c4a425816704a1e5b325fe7c8b9d2759a Mon Sep 17 00:00:00 2001
From: "Eran (ev672n), Vosk" <ev672n@att.com>
Date: Mon, 22 Oct 2018 12:58:16 +0300
Subject: security check issues

updating spring version, using security check issues

Change-Id: I0fae1dc8212ad8ba1f27e9cd723f441d63434159
Issue-ID: SDC-1829
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
---
 pom.xml                                    | 12 +++++++++++-
 src/main/java/org/onap/sdc/dcae/FeApp.java |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 117f693..05a8df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.13.RELEASE</version>
+        <version>2.0.5.RELEASE</version>
         <relativePath />
         <!-- lookup parent from repository   -->
     </parent>
@@ -39,6 +39,10 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-tomcat</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -64,10 +68,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
+            <version>20160810</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -229,6 +235,10 @@
                             <groupId>org.springframework.boot</groupId>
                             <artifactId>spring-boot-starter-tomcat</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-databind</artifactId>
+                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
diff --git a/src/main/java/org/onap/sdc/dcae/FeApp.java b/src/main/java/org/onap/sdc/dcae/FeApp.java
index 01d757c..d0db5c4 100644
--- a/src/main/java/org/onap/sdc/dcae/FeApp.java
+++ b/src/main/java/org/onap/sdc/dcae/FeApp.java
@@ -7,7 +7,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.*;
 
 import javax.servlet.ServletContext;
-- 
cgit 1.2.3-korg