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

updating spring version, using security check issues

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

diff --git a/pom.xml b/pom.xml
index c59ce6d..b086c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,12 @@
     <name>dcae-dt</name>
     <url>DCAE FE</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
-        <relativePath />
-        <!-- lookup parent from repository   -->
-    </parent>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.5.RELEASE</version>
+		<relativePath /> <!-- lookup parent from repository   -->
+	</parent>
 
     <properties>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
@@ -50,6 +49,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>
@@ -85,6 +88,7 @@
                 <dependency>
                     <groupId>com.google.code.gson</groupId>
                     <artifactId>gson</artifactId>
+                    <version>2.8.5</version>
                 </dependency>
                 <dependency>
                     <groupId>org.json</groupId>
@@ -106,6 +110,10 @@
                             <groupId>org.slf4j</groupId>
                             <artifactId>slf4j-api</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>log4j-over-slf4j</artifactId>
+                        </exclusion>
                         <exclusion>
                             <groupId>log4j</groupId>
                             <artifactId>log4j</artifactId>
@@ -129,6 +137,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>
@@ -154,10 +166,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>
@@ -173,6 +187,10 @@
                             <groupId>org.slf4j</groupId>
                             <artifactId>slf4j-api</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>log4j-over-slf4j</artifactId>
+                        </exclusion>
                         <exclusion>
                             <groupId>log4j</groupId>
                             <artifactId>log4j</artifactId>
@@ -378,6 +396,16 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>exec</classifier>
+                        </configuration>
+                    </execution>
+                </executions>
                 <configuration>
                     <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                     <webResources>
diff --git a/src/main/java/org/onap/sdc/dcae/FeApp.java b/src/main/java/org/onap/sdc/dcae/FeApp.java
index c2e3bc9..7b5687c 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