X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fpom.xml;h=da2a9ddd260e3c84ca09919df94d34d70826fa4d;hb=b3c05da7941382b82513b5f0e2b88da4d8bb6bf2;hp=800a1b8372fa408658caae2bc6a4acb71ff2043f;hpb=11c069001de15e157e43b51658ce6e524ad98bff;p=integration%2Fdistribution.git

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 800a1b83..da2a9ddd 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -243,6 +243,7 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+    <!-- Depends on NIC, which is commented-out
      <dependency>
        <groupId>org.opendaylight.netvirt</groupId>
        <artifactId>vpnservice-features</artifactId>
@@ -250,6 +251,7 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+    -->
      <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
@@ -264,6 +266,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>
@@ -271,6 +274,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.ocpplugin</groupId>
       <artifactId>features-ocpplugin</artifactId>
@@ -278,7 +282,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!-- Issue with of-config merge requires this line commented out:
+    <!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
       <artifactId>features-of-config</artifactId>
@@ -286,7 +290,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
+    -->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>