From b7d8b97e10c62ef446b28fc071bb7536a248a304 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 26 Oct 2017 09:12:23 -0700
Subject: Fixing problems with features files

In progress.

Change-Id: Idb0d3f13eaa89d9241f4c543f1222c14ea288f2f
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: APPC-296
---
 .../features/src/main/resources/features.xml                   | 10 +++++-----
 appc-config/appc-data-services/provider/pom.xml                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'appc-config/appc-data-services')

diff --git a/appc-config/appc-data-services/features/src/main/resources/features.xml b/appc-config/appc-data-services/features/src/main/resources/features.xml
index 2f99eb3ad..a37150ab3 100644
--- a/appc-config/appc-data-services/features/src/main/resources/features.xml
+++ b/appc-config/appc-data-services/features/src/main/resources/features.xml
@@ -29,11 +29,11 @@
 	<feature name='appc-config-data-services' description="Application Controller Config Data Service"
 		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="${odl.mdsal.version}">odl-mdsal-broker</feature>
 		
-		<feature version="${sdnctl.dblib.version}">sdnc-dblib</feature>
-		<feature version="${sdnc.sli.version}">sdnc-sli</feature>
-		<feature version="${openecomp.sdnc.sql-resource.version}">sdnc-sql-resource</feature>
+		<feature>sdnc-dblib</feature>
+		<feature>sdnc-sli</feature>
+		<feature>sdnc-sql-resource</feature>
 		
 		<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
 		
@@ -42,6 +42,6 @@
 		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
 		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-data-services-provider/${project.version}</bundle>
+		<bundle>mvn:org.openecomp.appc/appc-config-data-services-provider/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml
index c4a442c1f..e00fa4c46 100644
--- a/appc-config/appc-data-services/provider/pom.xml
+++ b/appc-config/appc-data-services/provider/pom.xml
@@ -106,7 +106,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-config-data-services</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.config.data.services.AppcDataServiceActivator</Bundle-Activator>
+						<Bundle-Activator>org.openecomp.appc.data.services.AppcDataServiceActivator</Bundle-Activator>
 						<Export-Package>org.openecomp.appc.data.services</Export-Package>
 						<Import-Package>*</Import-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
-- 
cgit 1.2.3-korg