X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fpom.xml;h=170364bae4e85c690141c0c0895a21a158421c8c;hb=1cf1dd917aaa52c0d28e5e1bdc41e6ab57a0c940;hp=91ac1457ed50493eee0e8e85dc4ad5ae98a7a51d;hpb=39eb80214a1b75c4f97c735b06111e95a09befe0;p=integration%2Fdistribution.git

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 91ac1457..170364ba 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -26,28 +26,28 @@
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-authz</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto</groupId>
       <artifactId>features-alto-release</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${feature.alto.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -131,6 +131,7 @@
       <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>
@@ -152,6 +153,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
@@ -166,6 +168,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>genius-features</artifactId>
+      <version>${feature.genius.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>features-groupbasedpolicy</artifactId>
@@ -183,7 +192,7 @@
     <dependency>
       <groupId>org.opendaylight.l2switch</groupId>
       <artifactId>features-l2switch</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.l2switch.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -201,13 +210,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.messaging4transport</groupId>
-      <artifactId>messaging4transport-features</artifactId>
-      <version>${feature.messaging4transport.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.nemo</groupId>
       <artifactId>nemo-features</artifactId>
@@ -236,7 +238,30 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <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>
+    <!-- Depends on NIC, which is commented-out
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>vpnservice-features</artifactId>
+       <version>${feature.netvirt.vpnservice.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+    -->
+     <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
       <version>${feature.netide.version}</version>
@@ -250,6 +275,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>
@@ -257,7 +283,15 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!-- Issue with of-config merge requires this line commented out:
+    -->
+    <dependency>
+      <groupId>org.opendaylight.ocpplugin</groupId>
+      <artifactId>features-ocpplugin</artifactId>
+      <version>${feature.ocpplugin.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>
       <artifactId>features-of-config</artifactId>
@@ -265,7 +299,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
+    -->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>
@@ -294,13 +328,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library-features</artifactId>
@@ -322,13 +349,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-sfc-features</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.packetcable</groupId>
       <artifactId>features-packetcable-policy</artifactId>
@@ -336,24 +356,17 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.reservation</groupId>
-      <artifactId>features-reservation</artifactId>
-      <version>${feature.reservation.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>
       <artifactId>features-sdninterfaceapp</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.sdninterfaceapp.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfc</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${feature.sfc.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -402,7 +415,7 @@
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
       <artifactId>features-tsdr</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>${feature.tsdr.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -441,13 +454,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vpnservice</groupId>
-      <artifactId>vpnservice-features</artifactId>
-      <version>${feature.vpnservice.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yang-push</groupId>
       <artifactId>yangpush-features</artifactId>
@@ -459,7 +465,7 @@
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -470,7 +476,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
       <type>zip</type>
     </dependency>
    </dependencies>
@@ -541,7 +547,7 @@
               <systemPropertyVariables>
                 <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
                 <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                <karaf.distro.version>1.7.0-SNAPSHOT</karaf.distro.version>
+                <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                <dependency>org.opendaylight.odlparent:features-test</dependency>