From 25e87d95d30a297cf8ba7e71a6418f0e66ddccc2 Mon Sep 17 00:00:00 2001
From: Michael Reece <michaere@amdocs.com>
Date: Wed, 19 Sep 2018 16:33:16 +0100
Subject: [PATCH] Exclude dom4j dep causing security vunerability

Also update event-client dependency to 1.3.0 and reinstate
event-client-kafka dependency

Issue-ID: AAI-1614

Change-Id: Ia2e84c0b05c927afe2387c34113ebbdb5f0dd85f
Signed-off-by: Michael Reece <michaere@amdocs.com>
---
 champ-lib/champ-core/pom.xml     | 5 +++++
 champ-service-deps-janus/pom.xml | 4 ++++
 champ-service-deps-titan/pom.xml | 4 ++++
 pom.xml                          | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml
index c64b0df..11dfff8 100644
--- a/champ-lib/champ-core/pom.xml
+++ b/champ-lib/champ-core/pom.xml
@@ -44,6 +44,11 @@ limitations under the License.
             <groupId>org.onap.aai.event-client</groupId>
             <artifactId>event-client-dmaap</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.onap.aai.event-client</groupId>
+            <artifactId>event-client-kafka</artifactId>
+        </dependency>
         <!-- Event Bus Library - END -->
 
         <dependency>
diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index 92a74f1..9c42cab 100644
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -195,6 +195,10 @@ limitations under the License.
                     <groupId>org.codehaus.jackson</groupId>
                     <artifactId>jackson-mapper-asl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index 35be53e..adab048 100644
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -230,6 +230,10 @@ limitations under the License.
                     <groupId>org.mindrot</groupId>
                     <artifactId>jbcrypt</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index aa31861..7732ecc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@ limitations under the License.
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <event.client.version>1.2.1</event.client.version>
+        <event.client.version>1.3.0</event.client.version>
     </properties>
 
     <modules>
-- 
2.16.6