X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fpom.xml;h=45777eb4ecd82b1ccdd9ff5b89d88ae3fbc5b7cd;hb=36915df583b68967226c605efd4167f8ecf347f0;hp=cf4d655678523f213e00f6da2940614623a99ba1;hpb=2038ea01da50340fb9f43de569fd31f28ff61a22;p=integration%2Fdistribution.git

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cf4d6556..45777eb4 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -85,6 +85,13 @@
             <type>xml</type>
         </dependency>
         -->
+        <dependency>
+            <groupId>org.opendaylight.atrium</groupId>
+            <artifactId>atrium-features</artifactId>
+            <version>${feature.atrium.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
@@ -155,7 +162,6 @@
             <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>
@@ -177,7 +183,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>
@@ -185,6 +190,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.eman</groupId>
+            <artifactId>eman-features</artifactId>
+            <version>${feature.eman.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features-faas</artifactId>
@@ -206,6 +218,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>infrautils-features</artifactId>
+            <version>${feature.infrautils.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.iotdm</groupId>
             <artifactId>onem2m-features</artifactId>
@@ -332,7 +351,6 @@
             <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>
@@ -340,7 +358,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
             <artifactId>circuitsw-features</artifactId>
@@ -404,15 +421,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Remove sdninterfaceapp until they remove their dependency on tcpmd5
-            <dependency>
-                <groupId>org.opendaylight.sdninterfaceapp</groupId>
-                <artifactId>features-sdninterfaceapp</artifactId>
-                <version>${feature.sdninterfaceapp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-        -->
+        <dependency>
+            <groupId>org.opendaylight.sdninterfaceapp</groupId>
+            <artifactId>features-sdninterfaceapp</artifactId>
+            <version>${feature.sdninterfaceapp.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>features-sfc</artifactId>
@@ -483,7 +498,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Commenting due to faulty feature POM file
         <dependency>
             <groupId>org.opendaylight.usecplugin</groupId>
             <artifactId>usecplugin-features</artifactId>
@@ -491,7 +505,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>