From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 4 Sep 2017 21:37:25 -0700
Subject: Change to CCSDK and ODL Carbon

Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
---
 appc-event-listener/appc-event-listener-bundle/pom.xml      | 13 ++++++++++++-
 .../src/main/resources/features.xml                         |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'appc-event-listener')

diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml
index 52dccf043..fd14847be 100644
--- a/appc-event-listener/appc-event-listener-bundle/pom.xml
+++ b/appc-event-listener/appc-event-listener-bundle/pom.xml
@@ -54,6 +54,17 @@
 		</dependency>
 -->
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>${apache.httpcomponents.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>equinoxSDK381</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
@@ -97,7 +108,7 @@
 						<Bundle-SymbolicName>org.openecomp.appc.listener</Bundle-SymbolicName>
 						<Bundle-Activator>org.openecomp.appc.listener.AppcEventListenerActivator</Bundle-Activator>
 						<Export-Package>org.openecomp.appc.listener</Export-Package>
-						<Import-Package>org.openecomp.appc.adapter.message.*,org.openecomp.appc.adapter.factory.*,org.openecomp.appc.adapter.messaging.*
+						<Import-Package>org.apache.http,org.openecomp.appc.adapter.message.*,org.openecomp.appc.adapter.factory.*,org.openecomp.appc.adapter.messaging.*
 							org.openecomp.appc.exceptions, org.openecomp.appc.util,
 							com.att.eelf.configuration, com.att.eelf.i18n,
 							*;resolution:=optional
diff --git a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
index c7696facd..2d0ef4118 100644
--- a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
+++ b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml
@@ -33,8 +33,8 @@
     
     <feature name='appc-event-listener' description="event listener" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-<!--         <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> -->
-        <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
+<!--         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> -->
+        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
         <bundle dependency="true">mvn:org.openecomp.appc/appc-metric-bundle/${project.version}</bundle>
         <bundle>mvn:org.openecomp.appc/appc-event-listener-bundle/${project.version}</bundle>
-- 
cgit 1.2.3-korg