From fc20f112c620afdd75c2cdc39530b2a5d332eae9 Mon Sep 17 00:00:00 2001
From: Sam Hague <shague@redhat.com>
Date: Mon, 20 Oct 2014 16:04:02 -0400
Subject: [PATCH] Add missing feature dependencies to ovsdb karaf distro

Change-Id: Ib2514bc331928e34a10ae2d7a257a1d1d2193cdd
Signed-off-by: Sam Hague <shague@redhat.com>
---
 distribution/opendaylight-karaf/pom.xml | 32 ++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/distribution/opendaylight-karaf/pom.xml b/distribution/opendaylight-karaf/pom.xml
index 3a92b467f..01214c97b 100644
--- a/distribution/opendaylight-karaf/pom.xml
+++ b/distribution/opendaylight-karaf/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>distribution-karaf</artifactId>
   <groupId>org.opendaylight.ovsdb</groupId>
-  <version>1.1.0-SNAPSHOT</version>
+  <name>OpenDaylight OVSDB Karaf Distribution</name>
   <packaging>pom</packaging>
   <prerequisites>
     <maven>3.0</maven>
@@ -18,8 +18,8 @@
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
     <karaf.version>3.0.1</karaf.version>
+    <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
-    <feature.ovsdb.openstack.version>1.1.0-SNAPSHOT</feature.ovsdb.openstack.version>
   </properties>
 
   <dependencies>
@@ -54,6 +54,26 @@
       <version>${karaf.resources.version}</version>
     </dependency>
 
+    <!-- Other ODL features needed -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-base</artifactId>
+      <version>${odl.karaf.base.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-nsf</artifactId>
+      <version>${nsf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Project local features -->
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>features-ovsdb</artifactId>
@@ -173,10 +193,10 @@
         <configuration>
           <bootFeatures>
             <feature>standard</feature>
-              <feature>odl-base-all</feature>
-              <feature>odl-adsal-northbound</feature>
-              <feature>odl-openflow-nxm-extensions</feature>
-              <feature>odl-nsf-all</feature>
+            <feature>odl-base-all</feature>
+            <feature>odl-adsal-northbound</feature>
+            <feature>odl-openflow-nxm-extensions</feature>
+            <feature>odl-nsf-all</feature>
           </bootFeatures>
         </configuration>
         <executions>
-- 
2.36.6