From 102790938e1d344121be0edda6f82b6f1d9530fb Mon Sep 17 00:00:00 2001
From: Sunil Unnava <su622b@att.com>
Date: Tue, 27 Feb 2018 02:32:46 -0500
Subject: [PATCH] Security and licence issues fixes

Issue-ID: DMAAP-307
Change-Id: I8be70f2f303148e7d104617e446c4d53faf6a5ac
Signed-off-by: Sunil Unnava <su622b@att.com>
---
 datarouter-node/pom.xml | 27 +++++++++++++++++++++++++--
 datarouter-prov/pom.xml | 27 +++++++++++++++++++++++++--
 pom.xml                 |  4 ++--
 version.properties      |  2 +-
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 1db177f2..f43fbd1c 100644
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.dmaap.datarouter</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -86,6 +86,23 @@
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
 		</dependency>
+		 <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-classic</artifactId>
+		<version>1.2.0</version>
+		<scope>compile</scope>
+	</dependency>
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-core</artifactId>
+		<version>1.2.0</version>
+		<scope>compile</scope>
+	</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
@@ -182,12 +199,18 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.2.3</version>
+			<version>4.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.sonatype.http-testing-harness</groupId>
 			<artifactId>junit-runner</artifactId>
 			<version>0.11</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.databene</groupId>
+					<artifactId>contiperf</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index c1eae740..9d6841c7 100644
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.dmaap.datarouter</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -55,6 +55,23 @@
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	 <dependencies>
+	     <dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-classic</artifactId>
+		<version>1.2.0</version>
+		<scope>compile</scope>
+	</dependency>
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-core</artifactId>
+		<version>1.2.0</version>
+		<scope>compile</scope>
+	</dependency>
+	     <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.7</version>
+        </dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
@@ -165,12 +182,18 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.2.3</version>
+			<version>4.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.sonatype.http-testing-harness</groupId>
 			<artifactId>junit-runner</artifactId>
 			<version>0.11</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.databene</groupId>
+					<artifactId>contiperf</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index edb9754f..5694cb78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <groupId>org.onap.dmaap.datarouter</groupId>
   <artifactId>parent</artifactId>
   <name>dmaap-datarouter</name>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/att/DMAAP_DATAROUTER</url>
  
@@ -34,7 +34,7 @@
   <parent>
 	<groupId>org.onap.oparent</groupId>
 	<artifactId>oparent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>0.1.1</version>
   </parent>
 	
   <properties>
diff --git a/version.properties b/version.properties
index 962ae520..30cdf7e2 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6