From: su622b <su622b@att.com>
Date: Wed, 1 Apr 2020 00:40:31 +0000 (-0400)
Subject: fix security vulnerabilities
X-Git-Tag: 6.0.0-ONAP~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmsgrtr.git;a=commitdiff_plain;h=8f438a8d984cdcdbc948a9e04339ebdc95643fcf

fix security vulnerabilities

Issue-ID: DMAAP-1418
Change-Id: I3c605888753a2e97c01db5a0101a93933875b165
Signed-off-by: su622b <su622b@att.com>
---

diff --git a/pom.xml b/pom.xml
index 3fe1699..958e7c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,21 +79,6 @@
 	</developers>
 
 	<dependencies>
-	    <!-- <dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-catalina</artifactId>
-			<version>8.5.23</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-util</artifactId>
-			<version>8.5.23</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<version>8.5.23</version>
-		</dependency> -->
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
@@ -261,7 +246,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.18.RELEASE</version>
+			<version>5.2.3.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -301,11 +286,16 @@
 		</dependency>
 
 		<!-- Apache Kafka -->
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.11</artifactId>
-		<version>0.11.0.3</version>
-		</dependency>
+<dependency>
+	<groupId>org.apache.kafka</groupId>
+	<artifactId>kafka_2.11</artifactId>
+	<version>0.11.0.3</version>
+      </dependency>
+	<dependency>
+		<groupId>commons-codec</groupId>
+		<artifactId>commons-codec</artifactId>
+		<version>1.13</version>
+	</dependency>
 	<dependency>
 		<groupId>com.google.guava</groupId>
 		<artifactId>guava</artifactId>
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java
index 5f616c7..10b04b2 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java
@@ -38,7 +38,6 @@ import org.springframework.util.StringUtils;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
-import kafka.common.FailedToSendMessageException;
 
 
 
diff --git a/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java
index 5d058b9..d18d268 100644
--- a/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java
+++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java
@@ -72,7 +72,6 @@ import com.att.nsa.security.NsaApiKey;
 import com.att.nsa.security.db.simple.NsaSimpleApiKey;
 
 import jline.internal.Log;
-import kafka.consumer.Consumer;