From: econwar <conor.ward@est.tech>
Date: Fri, 26 Apr 2019 13:32:21 +0000 (+0000)
Subject: Fix security vulnerabilities
X-Git-Tag: 2.1.3~47^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=74b69edd95bd68a145026c4612d994ba686744be

Fix security vulnerabilities

Decrease Hibernate version to 5.2.9.Final

Change-Id: Ie5fd2103d2d66edc9f67786a51a2451200d16495
Issue-ID: DMAAP-1176
Signed-off-by: econwar <conor.ward@est.tech>
---

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 537b05b5..06aa3fcf 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -128,10 +128,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
     </dependencies>
     <profiles>
         <profile>
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 281cea7c..56a4b139 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -166,7 +166,13 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.4.1.Final</version>
+            <version>5.2.9.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -180,8 +186,9 @@
             <version>1.0.2.Final</version>
         </dependency>
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
         </dependency>
     </dependencies>
     <profiles>
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 0182362c..6c577a32 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -89,10 +89,6 @@
             <version>1.2.17</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
     </dependencies>
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index 7a524b57..6db34b61 100755
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@
         <sl4j-api.version>1.7.25</sl4j-api.version>
         <hamcrest-lib.version>1.3</hamcrest-lib.version>
         <annotations.version>12.0</annotations.version>
-        <xstream.version>1.4.10</xstream.version>
     </properties>
     <modules>
         <module>datarouter-prov</module>
@@ -204,6 +203,10 @@
                         <groupId>org.databene</groupId>
                         <artifactId>contiperf</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.thoughtworks.xstream</groupId>
+                        <artifactId>xstream</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -257,11 +260,6 @@
                 <artifactId>json</artifactId>
                 <version>${json.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>${xstream.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>