X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fpom.xml;h=cf74dc82a3782cab79ed26ebcb5fe5a9d63127e4;hb=e4747edad8a6c9546e84c5472a5343a1336de36d;hp=cc58043a0d5998ad7ba96a63757dbd64f8d177eb;hpb=ce708856491bcd2c85ceaf846453e13e2a21ebdb;p=integration%2Fdistribution.git

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cc58043a..cf74dc82 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -131,6 +131,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
     <dependency>
       <groupId>org.opendaylight.didm</groupId>
       <artifactId>features-didm</artifactId>
@@ -152,6 +153,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
@@ -166,6 +168,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>genius-features</artifactId>
+      <version>${feature.genius.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>features-groupbasedpolicy</artifactId>
@@ -201,13 +210,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.messaging4transport</groupId>
-      <artifactId>messaging4transport-features</artifactId>
-      <version>${feature.messaging4transport.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.nemo</groupId>
       <artifactId>nemo-features</artifactId>
@@ -236,7 +238,28 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>features-netvirt</artifactId>
+       <version>${feature.netvirt.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>openstack.net-virt-sfc-features</artifactId>
+       <version>${feature.netvirt.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>vpnservice-features</artifactId>
+       <version>${feature.netvirt.vpnservice.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
       <version>${feature.netide.version}</version>
@@ -250,6 +273,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
     <dependency>
       <groupId>org.opendaylight.nic</groupId>
       <artifactId>features-nic</artifactId>
@@ -257,7 +281,15 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!-- Issue with of-config merge requires this line commented out:
+    -->
+    <dependency>
+      <groupId>org.opendaylight.ocpplugin</groupId>
+      <artifactId>features-ocpplugin</artifactId>
+      <version>${feature.ocpplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
       <artifactId>features-of-config</artifactId>
@@ -265,7 +297,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
+    -->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>
@@ -294,13 +326,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library-features</artifactId>
@@ -322,13 +347,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-sfc-features</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.packetcable</groupId>
       <artifactId>features-packetcable-policy</artifactId>
@@ -336,13 +354,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.reservation</groupId>
-      <artifactId>features-reservation</artifactId>
-      <version>${feature.reservation.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>
       <artifactId>features-sdninterfaceapp</artifactId>
@@ -441,13 +452,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vpnservice</groupId>
-      <artifactId>vpnservice-features</artifactId>
-      <version>${feature.vpnservice.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yang-push</groupId>
       <artifactId>yangpush-features</artifactId>