From 25aa909490e9e91475e1a0ae3a186a6a17fe13fe Mon Sep 17 00:00:00 2001
From: "Eran (ev672n), Vosk" <ev672n@att.com>
Date: Mon, 15 Oct 2018 10:52:26 +0300
Subject: security check issues

updating spring version, using security check issues

Change-Id: I55018c335f4167709dc92de891c224fcdad1dc7a
Issue-ID: SDC-1829
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
---
 .../sdc/dcae/composition/CompositionEngine.java    | 24 ++++++++++------------
 dcaedt_catalog/asdc/pom.xml                        |  4 ++--
 dcaedt_catalog/commons/pom.xml                     |  2 +-
 .../catalog/commons/JSONHttpMessageConverter.java  |  4 ++--
 dcaedt_catalog/service/pom.xml                     |  4 ++--
 dcaedt_tools/pom.xml                               |  3 ++-
 dcaedt_validator/checker/pom.xml                   |  4 ++--
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java
index 186f3f6..c633c59 100644
--- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java
+++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java
@@ -1,23 +1,12 @@
 package org.onap.sdc.dcae.composition;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Properties;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import javax.servlet.ServletContext;
-
+import org.onap.sdc.common.onaplog.Enums.LogLevel;
 import org.onap.sdc.common.onaplog.OnapLoggerDebug;
 import org.onap.sdc.common.onaplog.OnapLoggerError;
-import org.onap.sdc.common.onaplog.Enums.LogLevel;
 import org.onap.sdc.dcae.composition.util.SystemProperties;
-import org.onap.sdc.dcae.filter.LoggingFilter;
 import org.onap.sdc.dcae.errormng.ErrConfMgr;
-import org.onap.sdc.dcae.errormng.ErrorConfiguration;
 import org.onap.sdc.dcae.errormng.ErrorConfigurationLoader;
+import org.onap.sdc.dcae.filter.LoggingFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -35,6 +24,15 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Properties;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
 @Configuration
 @EnableScheduling
 @SpringBootApplication
diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml
index a6cdd58..1414a91 100644
--- a/dcaedt_catalog/asdc/pom.xml
+++ b/dcaedt_catalog/asdc/pom.xml
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>4.3.17.RELEASE</version>
+			<version>5.0.9.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.17.RELEASE</version>
+			<version>5.0.9.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/dcaedt_catalog/commons/pom.xml b/dcaedt_catalog/commons/pom.xml
index a50b287..2008b6c 100644
--- a/dcaedt_catalog/commons/pom.xml
+++ b/dcaedt_catalog/commons/pom.xml
@@ -130,7 +130,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>4.3.17.RELEASE</version>
+			<version>5.0.9.RELEASE</version>
 		</dependency>
 	</dependencies>
 	<properties>
diff --git a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/JSONHttpMessageConverter.java b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/JSONHttpMessageConverter.java
index e711279..31f4c5c 100644
--- a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/JSONHttpMessageConverter.java
+++ b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/JSONHttpMessageConverter.java
@@ -91,8 +91,8 @@ public class JSONHttpMessageConverter extends AbstractHttpMessageConverter<Objec
 	private Charset getCharset(HttpHeaders theHeaders) { 
   	if (theHeaders != null &&
 				theHeaders.getContentType() != null &&
-				theHeaders.getContentType().getCharSet() != null) { 
-   		return theHeaders.getContentType().getCharSet(); 
+				theHeaders.getContentType().getCharset() != null) {
+   		return theHeaders.getContentType().getCharset();
   	} 
   	return DEFAULT_CHARSET; 
 	} 
diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml
index eb4a175..b4f20d2 100644
--- a/dcaedt_catalog/service/pom.xml
+++ b/dcaedt_catalog/service/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>4.3.17.RELEASE</version>
+			<version>5.0.9.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.17.RELEASE</version>
+			<version>5.0.9.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml
index fa3464f..2109bc9 100644
--- a/dcaedt_tools/pom.xml
+++ b/dcaedt_tools/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <properties>
+        <!--suppress UnresolvedMavenProperty -->
         <docker.staging.tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</docker.staging.tag>
     </properties>
 
@@ -248,7 +249,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.2</version>
+            <version>2.9.6</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml
index 4e73ad0..2cf5943 100644
--- a/dcaedt_validator/checker/pom.xml
+++ b/dcaedt_validator/checker/pom.xml
@@ -135,12 +135,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.7.6</version>
+			<version>2.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.7.8</version>
+			<version>2.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.reflections</groupId>
-- 
cgit 1.2.3-korg