From: Harman Singh <harmasin@cisco.com>
Date: Sat, 3 Oct 2015 18:35:02 +0000 (-0700)
Subject: Bug 4405 Removing ad-sal and nsf feature reference from dlux distribution
X-Git-Tag: release/beryllium~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=820e3dd0065c5db166cf798ec12dfcb7f42b72c0;p=dlux.git

Bug 4405 Removing ad-sal and nsf feature reference from dlux distribution

Change-Id: I6875755e39ee2ec2580bf068bac9eab812d501e1
Signed-off-by: Harman Singh <harmasin@cisco.com>
---

diff --git a/distribution-dlux/pom.xml b/distribution-dlux/pom.xml
index 4bcd4662..18d019ee 100644
--- a/distribution-dlux/pom.xml
+++ b/distribution-dlux/pom.xml
@@ -77,22 +77,6 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <classifier>features</classifier>
-      <version>${feature.adsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <classifier>features</classifier>
-      <version>${feature.nsf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 7c27da1e..08deb9e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,6 @@
       <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>
       <feature.flow.version>1.3.0-SNAPSHOT</feature.flow.version>
       <feature.yangtools.version>0.8.0-SNAPSHOT</feature.yangtools.version>
-      <feature.adsal.version>0.10.0-SNAPSHOT</feature.adsal.version>
-      <feature.nsf.version>0.6.0-SNAPSHOT</feature.nsf.version>
       <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
       <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
       <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>