From: Sam Hague <shague@redhat.com>
Date: Mon, 9 Mar 2015 17:33:35 +0000 (-0400)
Subject: Add ovsdb-features to karaf distribution
X-Git-Tag: release/lithium~331
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=71c7fd06ac88a4a662065babaa396bd175ffe564;p=ovsdb.git

Add ovsdb-features to karaf distribution

The karaf distribution does not currently have any dependencies defined so it is building before some of the ovsdb modules are built. Adding the features dependency ensures that the other modules will build first.

Change-Id: Icc366d7c3decc5bf041babc2bf2f651ed3fa6a17
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 02db4adb1..3fa43dc7b 100755
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -35,6 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- OVSDB Component Versions -->
     <openstack.netvirt.version>1.1.0-SNAPSHOT</openstack.netvirt.version>
     <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.version>
+    <ovsdb.features.version>1.1.0-SNAPSHOT</ovsdb.features.version>
     <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
     <ovsdb.northbound.version>0.7.0-SNAPSHOT</ovsdb.northbound.version>
     <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
@@ -289,6 +290,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>openflowplugin-extension-nicira-config</artifactId>
         <version>${openflowplugin.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>features-ovsdb</artifactId>
+        <version>${ovsdb.features.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>library</artifactId>
diff --git a/distribution/opendaylight-karaf/pom.xml b/distribution/opendaylight-karaf/pom.xml
index 7dc7a0b1c..b50d23ac6 100644
--- a/distribution/opendaylight-karaf/pom.xml
+++ b/distribution/opendaylight-karaf/pom.xml
@@ -73,6 +73,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-ovsdb</artifactId>
+    </dependency>
   </dependencies>
 
   <build>