X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fpom.xml;h=a6f1d24a9706b2e0bb4f58743c205d0de7e84a4d;hb=7d51fc92f1325e272dbb7ba2bf508fac6c5fbb7a;hp=ef5bbf0d5e5851ad7fd1e96baa3bff6ef529679d;hpb=c94af07ca1d9f4b6ea9cf8345ec436064f46f722;p=integration%2Fdistribution.git

diff --git a/features-index/pom.xml b/features-index/pom.xml
index ef5bbf0d..a6f1d24a 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,6 @@
             <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>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.atrium</groupId>
             <artifactId>atrium-features</artifactId>
@@ -134,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>
@@ -190,6 +179,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dluxapps</groupId>
+            <artifactId>features-dluxapps</artifactId>
+            <version>${feature.dluxapps.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.eman</groupId>
             <artifactId>eman-features</artifactId>
@@ -218,6 +214,13 @@
             <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>
@@ -302,6 +305,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>
@@ -309,7 +319,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Failed netide merge job makes distribution fail
         <dependency>
             <groupId>org.opendaylight.netide</groupId>
             <artifactId>netide-features</artifactId>
@@ -317,7 +326,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>features-neutron</artifactId>
@@ -360,13 +368,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>
@@ -423,6 +424,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- No snapshot artifacts available due to Bug 7404
         <dependency>
             <groupId>org.opendaylight.sdninterfaceapp</groupId>
             <artifactId>features-sdninterfaceapp</artifactId>
@@ -430,6 +432,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>features-sfc</artifactId>
@@ -535,7 +538,7 @@
         </dependency>
         <!-- dependency for opendaylight-karaf-empty for use by testing -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>opendaylight-karaf-empty</artifactId>
             <version>${feature.odlparent.version}</version>
             <type>zip</type>
@@ -549,6 +552,20 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <!-- This generates the META-INF/maven/dependencies.properties file
+                     which is required by the versionAsInProject() used in SingleFeatureTest -->
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>maven-paxexam-plugin</artifactId>
+                <executions>
+                  <execution>
+                   <id>generate-dependencies.properties-file</id>
+                   <goals>
+                     <goal>generate-depends-file</goal>
+                   </goals>
+                  </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
@@ -606,7 +623,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+                        <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
                         <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
                         <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
                     </systemPropertyVariables>