Security and licence issues fixes

Issue-ID: DMAAP-307
Change-Id: I8be70f2f303148e7d104617e446c4d53faf6a5ac
Signed-off-by: Sunil Unnava <su622b@att.com>

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 1db177f..f43fbd1 100644 (file)
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
        <parent>\r
                <groupId>org.onap.dmaap.datarouter</groupId>\r
                <artifactId>parent</artifactId>\r
-               <version>1.0.0-SNAPSHOT</version>\r
+               <version>1.0.1-SNAPSHOT</version>\r
                <relativePath>../pom.xml</relativePath>\r
        </parent>\r
        \r
@@ -86,6 +86,23 @@
                        <artifactId>servlet-api</artifactId>\r
                        <version>2.5</version>\r
                </dependency>\r
+                <dependency>\r
+            <groupId>com.thoughtworks.xstream</groupId>\r
+            <artifactId>xstream</artifactId>\r
+            <version>1.4.7</version>\r
+        </dependency>\r
+       <dependency>\r
+               <groupId>ch.qos.logback</groupId>\r
+               <artifactId>logback-classic</artifactId>\r
+               <version>1.2.0</version>\r
+               <scope>compile</scope>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>ch.qos.logback</groupId>\r
+               <artifactId>logback-core</artifactId>\r
+               <version>1.2.0</version>\r
+               <scope>compile</scope>\r
+       </dependency>\r
 \r
                <dependency>\r
                        <groupId>org.eclipse.jetty</groupId>\r
@@ -182,12 +199,18 @@
                <dependency>\r
                        <groupId>org.apache.httpcomponents</groupId>\r
                        <artifactId>httpclient</artifactId>\r
-                       <version>4.2.3</version>\r
+                       <version>4.5.3</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.sonatype.http-testing-harness</groupId>\r
                        <artifactId>junit-runner</artifactId>\r
                        <version>0.11</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>org.databene</groupId>\r
+                                       <artifactId>contiperf</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
 \r
 \r

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index c1eae74..9d6841c 100644 (file)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
        <parent>\r
                <groupId>org.onap.dmaap.datarouter</groupId>\r
                <artifactId>parent</artifactId>\r
-               <version>1.0.0-SNAPSHOT</version>\r
+               <version>1.0.1-SNAPSHOT</version>\r
                <relativePath>../pom.xml</relativePath>\r
        </parent>\r
        \r
@@ -55,6 +55,23 @@
                <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
         <dependencies>\r
+            <dependency>\r
+               <groupId>ch.qos.logback</groupId>\r
+               <artifactId>logback-classic</artifactId>\r
+               <version>1.2.0</version>\r
+               <scope>compile</scope>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>ch.qos.logback</groupId>\r
+               <artifactId>logback-core</artifactId>\r
+               <version>1.2.0</version>\r
+               <scope>compile</scope>\r
+       </dependency>\r
+            <dependency>\r
+            <groupId>com.thoughtworks.xstream</groupId>\r
+            <artifactId>xstream</artifactId>\r
+            <version>1.4.7</version>\r
+        </dependency>\r
                <dependency>\r
                        <groupId>org.json</groupId>\r
                        <artifactId>json</artifactId>\r
@@ -165,12 +182,18 @@
                <dependency>\r
                        <groupId>org.apache.httpcomponents</groupId>\r
                        <artifactId>httpclient</artifactId>\r
-                       <version>4.2.3</version>\r
+                       <version>4.5.3</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.sonatype.http-testing-harness</groupId>\r
                        <artifactId>junit-runner</artifactId>\r
                        <version>0.11</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>org.databene</groupId>\r
+                                       <artifactId>contiperf</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>junit</groupId>\r

diff --git a/pom.xml b/pom.xml
index edb9754..5694cb7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <groupId>org.onap.dmaap.datarouter</groupId>\r
   <artifactId>parent</artifactId>\r
   <name>dmaap-datarouter</name>\r
-  <version>1.0.0-SNAPSHOT</version>\r
+  <version>1.0.1-SNAPSHOT</version>\r
   <packaging>pom</packaging>\r
   <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
  \r
@@ -34,7 +34,7 @@
   <parent>\r
        <groupId>org.onap.oparent</groupId>\r
        <artifactId>oparent</artifactId>\r
-       <version>1.0.0-SNAPSHOT</version>\r
+       <version>0.1.1</version>\r
   </parent>\r
        \r
   <properties>\r

diff --git a/version.properties b/version.properties
index 962ae52..30cdf7e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 \r
 major=1\r
 minor=0\r
-patch=0\r
+patch=1\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r