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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cf4d6556..a88a94e4 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>root</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>features-integration-index</artifactId>
     <packaging>jar</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project gathering feature repositories of all ODL projects participating in distribution.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
@@ -46,13 +46,6 @@
             <type>xml</type>
         </dependency>
         <!-- feature repository dependencies from other ODL projects -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <version>${feature.aaa.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
@@ -62,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-authz</artifactId>
+            <artifactId>features-aaa-shiro</artifactId>
             <version>${feature.aaa.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
@@ -74,17 +67,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Remove Armoury from Beryllium release as per as committers consent:
-            https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-            Need to be uncommented once in Boron
         <dependency>
-            <groupId>org.opendaylight.armoury</groupId>
-            <artifactId>armoury-features</artifactId>
-            <version>${feature.armoury.version}</version>
+            <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>
@@ -127,6 +116,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.cardinal</groupId>
+            <artifactId>cardinal-features</artifactId>
+            <version>${feature.cardinal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.centinel</groupId>
             <artifactId>centinel-features</artifactId>
@@ -155,7 +151,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 +172,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>
@@ -185,6 +179,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 +207,20 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>vbd-features</artifactId>
+            <version>${feature.honeycomb.vbd.version}</version>
+            <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>
@@ -283,6 +298,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>openstack.sfc-translator-features</artifactId>
+            <version>${feature.netvirt.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>vpnservice-features</artifactId>
@@ -332,7 +354,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,14 +361,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
-            <artifactId>circuitsw-features</artifactId>
-            <version>${feature.circuitsw.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin</artifactId>
@@ -404,15 +417,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 +494,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 +501,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>