From b65fcbf6928b13600e7764b9f37ba039cb64b6c9 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 26 Jul 2021 15:01:06 +0100
Subject: [PATCH] Remove dependency vulnerability

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Id6f1a33b86369b54af70094686d3a15d4dca3b15
Issue-ID: SDC-3572
---
 asdctool/pom.xml          | 14 ++++++++++++++
 catalog-be/pom.xml        |  8 ++++++++
 catalog-dao/pom.xml       |  4 ++++
 catalog-fe/pom.xml        |  4 ++++
 catalog-model/pom.xml     |  8 ++++++++
 common-app-api/pom.xml    |  2 +-
 integration-tests/pom.xml | 16 ++++------------
 pom.xml                   |  2 +-
 8 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 5ad047e124..400ce67d67 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -311,9 +311,19 @@
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>${org.dom4j.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
@@ -343,6 +353,10 @@
           <groupId>org.hibernate</groupId>
           <artifactId>hibernate-validator</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.cassandra</groupId>
+          <artifactId>cassandra-all</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index bf56d4d3c9..666b58aa3c 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -420,6 +420,10 @@
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -545,6 +549,10 @@
           <groupId>commons-fileupload</groupId>
           <artifactId>commons-fileupload</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.xmlgraphics</groupId>
+          <artifactId>xmlgraphics-commons</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 4a2baa9d19..e74a1094a9 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -289,6 +289,10 @@ Modifications copyright (c) 2018 Nokia
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 5e950a0b40..05473627ab 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -284,6 +284,10 @@
           <groupId>commons-fileupload</groupId>
           <artifactId>commons-fileupload</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.xmlgraphics</groupId>
+          <artifactId>xmlgraphics-commons</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 55c2a693a9..95c50e6dd6 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -174,6 +174,10 @@
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -203,6 +207,10 @@
           <groupId>org.hibernate</groupId>
           <artifactId>hibernate-validator</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.cassandra</groupId>
+          <artifactId>cassandra-all</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 019f5918cc..87c89d99cb 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -35,7 +35,7 @@
           <artifactId>esapi</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.hibernate</groupId>
+          <groupId>org.hibernate.validator</groupId>
           <artifactId>hibernate-validator</artifactId>
         </exclusion>
       </exclusions>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7a544eab78..24676c9afa 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -77,18 +77,6 @@ limitations under the License.
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -159,6 +147,10 @@ limitations under the License.
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index c5c7a97642..02476bebae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <cxf.version>3.4.3</cxf.version>
 
         <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version>
+        <org.dom4j.version>2.1.3</org.dom4j.version>
 
         <!-- JSON and YAML Parsing -->
         <jackson.version>2.12.1</jackson.version>
@@ -127,7 +128,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <mockito.version>3.7.7</mockito.version>
         <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
         <jmockit.version>1.35</jmockit.version>
-        <junit.version>4.13.1</junit.version>
         <junit.platform.version>1.7.1</junit.platform.version>
         <junitJupiter.version>5.7.0</junitJupiter.version>
         <assertj.version>3.16.0</assertj.version>
-- 
2.16.6