Merge "Upgrade dmaap client"

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 2a3ad50..4071eac 100644 (file)
--- 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 f263bf9..f4bb5a0 100644 (file)
--- 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 e8016a3..1cddd32 100644 (file)
--- 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>