summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-09-12 19:35:52 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-12 19:35:52 +0000
commit55e795c171cabb7800effcbbb75bed0224b92691 (patch)
tree4a069d04e60a079dd2dac340942e77239aa4bc39
parent786e6c02b0a95a8553cdea67861a3669ccb0c42e (diff)
parent8d0fed3d029a9e64a6bb97eb539da7dcb27bcc3b (diff)
Merge "Upgrade dmaap client"
-rw-r--r--BRMSGateway/pom.xml1
-rw-r--r--PolicyEngineUtils/pom.xml5
-rw-r--r--pom.xml1
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>