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>
---
 dcaedt_catalog/asdc/pom.xml                                           | 4 ++--
 dcaedt_catalog/commons/pom.xml                                        | 2 +-
 .../org/onap/sdc/dcae/catalog/commons/JSONHttpMessageConverter.java   | 4 ++--
 dcaedt_catalog/service/pom.xml                                        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'dcaedt_catalog')

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>
-- 
cgit 1.2.3-korg