Merge "Deleted duplicate declaration in pom.xml."

diff --git a/features/pom.xml b/features/pom.xml
index f15de4065b376479a1eeaa146b82e4e5a40fa64a..4c487b6135a97f8f034c1195f939f436c5662845 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -133,6 +133,14 @@
       <type>xml</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-ovs-sfc</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.snbi</groupId>
       <artifactId>features-snbi</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index f5cf4b2c7897e22c9e8df82f11a91da20aa2fbc6..0079783060f94c2e18fdf7b70ae774b4b7e83e9c 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -63,6 +63,7 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
@@ -122,4 +123,9 @@
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
     </feature>
+
+        <feature name='odl-integration-compatible-with-ovs-sfc' description="OpenDaylight :: OVS :: Service Function Chaining" version='${project.version}'>
+            <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+            <feature version='0.0.1-SNAPSHOT'>odl-ovsdb-ovssfc</feature>
+        </feature>
 </features>