From 84cdd4d4e354e856bf265c36d4953367cb9a1bd7 Mon Sep 17 00:00:00 2001
From: michaere <michaere@amdocs.com>
Date: Tue, 13 Mar 2018 11:17:03 +0000
Subject: [PATCH] Tidy pom's following event-client version update

Removed ability to override the version of the event-client

Issue-ID: AAI-873

Change-Id: I49c76cca0ac6da49964df277467f57a463b65069
Signed-off-by: michaere <michaere@amdocs.com>
---
 champ-service-deps-janus/pom.xml | 35 -----------------------------------
 champ-service-deps-titan/pom.xml | 34 ----------------------------------
 champ-service/pom.xml            | 30 ------------------------------
 3 files changed, 99 deletions(-)

diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index 9bc954c..e01cbd0 100644
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -6,47 +6,12 @@
     <artifactId>champ-service-deps-janus</artifactId>
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
-    
-    <properties>
-        <event.client.version>1.2.0</event.client.version>
-    </properties>
 
     <dependencies>
-         <!-- Event Bus Library. -->
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-api</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-dmaap</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-kafka</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.onap.aai</groupId>
             <artifactId>champ-janus</artifactId>
             <version>1.2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-dmaap</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-kafka</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.janusgraph</groupId>
diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index f4f081d..3f6165b 100644
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -6,46 +6,12 @@
     <artifactId>champ-service-deps-titan</artifactId>
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
-
-    <properties>
-        <event.client.version>1.2.0</event.client.version>
-    </properties>
     
     <dependencies>
-        <!-- Event Bus Library. -->
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-api</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-dmaap</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-kafka</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.aai</groupId>
             <artifactId>champ-titan</artifactId>
             <version>1.2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-dmaap</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-kafka</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.thinkaurelius.titan</groupId>
diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 358579e..25500c3 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -27,7 +27,6 @@
             top of pom.xml -->
         <distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
 
-        <event.client.version>1.2.0</event.client.version>
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.0</common.logging.version>
         <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version>
@@ -103,23 +102,6 @@
             <version>${org.apache.httpcomponents.httpclient.version}</version>
         </dependency>
 
-        <!-- Event Bus Library. -->
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-api</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-dmaap</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-kafka</artifactId>
-            <version>${event.client.version}</version>
-        </dependency>
-
         <!-- Champ graph database library. -->
         <dependency>
             <groupId>org.onap.aai</groupId>
@@ -131,18 +113,6 @@
                     <groupId>org.apache.hbase</groupId>
                     <artifactId>hbase-client</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-dmaap</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai.event-client</groupId>
-                    <artifactId>event-client-kafka</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
-- 
2.16.6