From 8d0fed3d029a9e64a6bb97eb539da7dcb27bcc3b Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 12 Sep 2018 14:02:56 -0400
Subject: [PATCH] Upgrade dmaap client

Upgrading to dmaap 1.1.8 for Casablanca. Hoping they have
removed some license issues.

Also, policy/parent has the version property definition
now because this dependency is shared across multiple repos.

Issue-ID: POLICY-1116
Change-Id: I6ffe7b7cf4b46b12b3ec8d534a58f0be40bb97b9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 BRMSGateway/pom.xml       | 1 -
 PolicyEngineUtils/pom.xml | 5 ++++-
 pom.xml                   | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 2a3ad50a5..4071eac27 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -77,7 +77,6 @@
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
-            <version>${dmaap.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index f263bf98b..f4bb5a09d 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -113,12 +113,15 @@
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
-            <version>${dmaap.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index e8016a3e5..1cddd321a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
 
         <!-- Project common dependency versions -->
         <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
-        <dmaap.version>1.1.3</dmaap.version>
         <httpclient.version>4.5.5</httpclient.version>
         <jackson.version>2.9.4</jackson.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
-- 
2.16.6