Adding SFC feature dependencies to ovs-sfc module

Change-Id: I5067febf5d1d3a006abc6d5caf19df31102bc99a
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index ce0e6661cceb0423ef9409d29fd45f7adf6843f7..caca6dfc8731851a09285c32dcbf2f21496dda7c 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -41,6 +41,13 @@
       <classifier>features</classifier>
       <type>xml</type>
       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sfc</groupId>
+      <artifactId>features-sfc</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
@@ -58,10 +65,6 @@
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>ovssfc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>sfc-model</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/features/ovs-sfc/src/main/resources/features.xml b/features/ovs-sfc/src/main/resources/features.xml
index 5e07507d7f7437f7dee500184768836f70de12dd..fe1394b4c0a0147e38681d5cf4b478d293ee2ae8 100644 (file)
--- a/features/ovs-sfc/src/main/resources/features.xml
+++ b/features/ovs-sfc/src/main/resources/features.xml
@@ -6,6 +6,7 @@
     <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/${openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${ovsdb.library.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.sfc/features-sfc/0.0.1-SNAPSHOT/xml/features</repository>
 
     <feature name="odl-ovsdb-ovssfc"
              description="OpenDaylight :: OVSDB :: OVS Service Function Chaining"
@@ -13,7 +14,8 @@
         <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
         <feature version="${openflowplugin.version}">odl-openflow-nxm-extensions</feature>
         <feature version="${nsf.version}">odl-nsf-all</feature>
-        <bundle>mvn:org.opendaylight.sfc/sfc-model/${sfc-model.version}</bundle>
+        <feature version='0.0.1-SNAPSHOT'>odl-sfc-provider</feature>
+        <feature version='0.0.1-SNAPSHOT'>odl-sfc-model</feature>
         <bundle>mvn:org.opendaylight.ovsdb/ovssfc/${ovsdb.ovssfc.version}</bundle>
     </feature>
 </features>