From c7d0075d223eab9f89fd28853c4b138792059be9 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 1 Jun 2017 10:45:37 -0700
Subject: Merge of new rebased code

Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>
---
 .../appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml          | 6 ++++++
 .../appc-dmaap-adapter-features/src/main/resources/features.xml     | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features')

diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
index 2181888fc..8f5b55c73 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
@@ -18,6 +18,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openecomp.appc</groupId>
+			<artifactId>appc-message-adapter-factory</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
index 90a31629e..baf04ddec 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
@@ -34,6 +34,8 @@
         <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
 <!--         <feature version="${sdnctl.sli.version}">sdnc-sli</feature> -->
         <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.openecomp.appc/appc-message-adapter-factory/${project.version}</bundle>
+        <bundle>mvn:org.openecomp.appc/appc-message-adapter-api/${project.version}</bundle>
         
     </feature>
 
-- 
cgit 1.2.3-korg