commit bbf1668256784af8268de8ce2b0b84e42c0e18d4
author Dan Timoney <dtimoney@att.com> Fri Sep 22 19:46:40 2017 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Sep 22 19:46:40 2017 +0000
tree 180ab965033742d0638884b8249ecdb3c21c8d3e
parent 862cac3e7b7b7bd835439d3a905d9c241a7ae742
parent e350d16c4a4f0a51b19fd60617cdf7f8924aca22

Merge "Fix sli dependency"

asdcApi/features/src/main/resources/features.xml

diff --git a/asdcApi/features/src/main/resources/features.xml b/asdcApi/features/src/main/resources/features.xml
index 2048dc1..0f7fe3b 100644
--- a/asdcApi/features/src/main/resources/features.xml
+++ b/asdcApi/features/src/main/resources/features.xml
@@ -32,7 +32,7 @@
         <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-model/${project.version}</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-provider/${project.version}</bundle>
 
-        <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
+        <feature>sdnc-sli</feature>
     </feature>
 
 </features>

dataChange/features/src/main/resources/features.xml

diff --git a/dataChange/features/src/main/resources/features.xml b/dataChange/features/src/main/resources/features.xml
index c52bab5..bd090f1 100644
--- a/dataChange/features/src/main/resources/features.xml
+++ b/dataChange/features/src/main/resources/features.xml
@@ -28,7 +28,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.onap.ccsdk.sli.northbound/dataChange-model/${project.version}</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.northbound/dataChange-provider/${project.version}</bundle>
     </feature>