commit 079a007f29994785912ca891c58e09f755189e58
author Ram Koya <rk541m@att.com> Wed Sep 05 17:13:54 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Sep 05 17:13:54 2018 +0000
tree 9e5e8ab84cb53ec1572eba57daf8d7dfbecff7c6
parent 517ccb3875a6951bbe701f24ff120b7a8e158791
parent d6e999b4574039aff36dd6505a4da74685ab171b

Merge "Update versions to fix security violations"

datarouter-node/pom.xml

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 18743db..5edffa6 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -69,13 +69,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.0</version>
+            <version>${qos.logback.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.2.0</version>
+            <version>${qos.logback.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

datarouter-prov/pom.xml

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 7613757..9ccbb55 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -45,13 +45,13 @@
         <dependency>

             <groupId>ch.qos.logback</groupId>

             <artifactId>logback-classic</artifactId>

-            <version>1.2.0</version>

+            <version>${qos.logback.version}</version>

             <scope>compile</scope>

         </dependency>

         <dependency>

             <groupId>ch.qos.logback</groupId>

             <artifactId>logback-core</artifactId>

-            <version>1.2.0</version>

+            <version>${qos.logback.version}</version>

             <scope>compile</scope>

         </dependency>

         <dependency>

datarouter-subscriber/pom.xml

diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 52cb25c..4d09d68 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -92,6 +92,23 @@
             <version>${jetty.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${thoughtworks.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${qos.logback.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${qos.logback.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.3</version>

pom.xml

diff --git a/pom.xml b/pom.xml
index 43aeca2..2781ab0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
         <jetty.version>9.3.8.RC0</jetty.version>
         <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
         <thoughtworks.version>1.4.10</thoughtworks.version>
+        <qos.logback.version>1.2.3</qos.logback.version>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>