From: Idan Amit <ia096e@intl.att.com>
Date: Wed, 14 Mar 2018 07:59:41 +0000 (+0200)
Subject: Fixed merge issues
X-Git-Tag: v1.2.0~260
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a65b55d5519e79b3291699b9289eb96d1ac884a5;p=sdc.git

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 0d1f30d0ac..f8c4eada94 100644
--- 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>