From: Brian Freeman <bf1936@att.com>
Date: Thu, 14 Sep 2017 19:37:45 +0000 (+0000)
Subject: Fix VNF-API etc loading
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=222e59956ca98f608e4bc07131bb81557da7b251;p=sdnc%2Fnorthbound.git

Fix VNF-API etc loading

Issue-ID: SDNC-86
Change-Id: I4f458850187b61d02309c1b4b261f08a5b97ec70
Signed-off-by: Brian Freeman <bf1936@att.com>
---

diff --git a/asdcApi/features/src/main/resources/features.xml b/asdcApi/features/src/main/resources/features.xml
index f25f6492..b6b45845 100644
--- a/asdcApi/features/src/main/resources/features.xml
+++ b/asdcApi/features/src/main/resources/features.xml
@@ -33,8 +33,7 @@
 
         <bundle>mvn:org.openecomp.sdnc.northbound/asdcApi-model/${project.version}</bundle>
         <bundle>mvn:org.openecomp.sdnc.northbound/asdcApi-provider/${project.version}</bundle>
-
-        <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
+        <feature>sdnc-sli</feature>
         <configfile finalname="etc/opendaylight/karaf/200-asdcApi-provider.xml">mvn:org.openecomp.sdnc.northbound/asdcApi-provider/${project.version}/xml/config</configfile>
     </feature>
 
diff --git a/dataChange/features/src/main/resources/features.xml b/dataChange/features/src/main/resources/features.xml
index 44076c63..254b58cf 100644
--- a/dataChange/features/src/main/resources/features.xml
+++ b/dataChange/features/src/main/resources/features.xml
@@ -30,7 +30,7 @@
     <feature name='sdnc-dataChange' description="sdnc-dataChange" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
+        <feature>sdnc-sli</feature>
         <bundle>mvn:org.openecomp.sdnc.northbound/dataChange-model/${project.version}</bundle>
         <bundle>mvn:org.openecomp.sdnc.northbound/dataChange-provider/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/200-dataChange-provider.xml">mvn:org.openecomp.sdnc.northbound/dataChange-provider/${project.version}/xml/config</configfile>
diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml
index 813459de..f652967e 100644
--- a/vnfapi/features/src/main/resources/features.xml
+++ b/vnfapi/features/src/main/resources/features.xml
@@ -30,7 +30,7 @@
     <feature name='sdnc-vnfapi' description="sdnc-vnfapi" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
+        <feature>sdnc-sli</feature>
         <bundle>mvn:org.openecomp.sdnc.northbound/vnfapi-model/${project.version}</bundle>
         <bundle>mvn:org.openecomp.sdnc.northbound/vnfapi-provider/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/200-vnfapi-provider.xml">mvn:org.openecomp.sdnc.northbound/vnfapi-provider/${project.version}/xml/config</configfile>