Fixed merge issues

Changed dmaapClient version to release version

Change-Id: I470c2da26f0a3412af37c24781e1fbc072d7547c
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 0d1f30d..f8c4ead 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -551,7 +551,7 @@
                <dependency>
                        <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
                        <artifactId>dmaapClient</artifactId>
-                       <version>1.1.3-SNAPSHOT</version>
+                       <version>1.1.3</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>