Restore faas to distribution test

[integration/distribution.git] / features-index / pom.xml

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cf74dc82a3782cab79ed26ebcb5fe5a9d63127e4..59d9bae1520d0f1ba2b652581259fb5b6f01e798 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -22,7 +22,15 @@
       <features.file>features.xml</features.file>
    </properties>
    <dependencies>
-    <!-- dependencies on feature repos -->
+    <!-- feature repository dependencies from this project -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>features-distribution</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <!-- feature repository dependencies from other ODL projects -->
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-api</artifactId>
@@ -210,6 +218,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.natapp</groupId>
+      <artifactId>natapp-features</artifactId>
+      <version>${feature.natapp.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.nemo</groupId>
       <artifactId>nemo-features</artifactId>
@@ -238,28 +253,28 @@
       <classifier>features</classifier>
       <type>xml</type>
     </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>
+      <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>
+    <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
       <version>${feature.netide.version}</version>
@@ -273,7 +288,6 @@
       <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>
@@ -281,7 +295,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    -->
     <dependency>
       <groupId>org.opendaylight.ocpplugin</groupId>
       <artifactId>features-ocpplugin</artifactId>
@@ -289,6 +302,20 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-akka</artifactId>
+      <version>${feature.odlparent.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-odlparent</artifactId>
+      <version>${feature.odlparent.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>
@@ -312,13 +339,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.openflowplugin</groupId>
-       <artifactId>features-openflowplugin-li</artifactId>
-       <version>${feature.openflowplugin.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
-     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-he</artifactId>
+      <version>${feature.openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin-extension</artifactId>
@@ -326,6 +353,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension-he</artifactId>
+      <version>${feature.openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library-features</artifactId>
@@ -438,6 +472,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <!-- Commenting due to faulty feature POM file
     <dependency>
       <groupId>org.opendaylight.usecplugin</groupId>
       <artifactId>usecplugin-features</artifactId>
@@ -445,6 +480,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.vtn</groupId>
       <artifactId>features-vtn-manager</artifactId>