Remove tcpmd5 from distribution Boron

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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index b70dc5226a3b6d99f51b9f5ea4815ecda3a8e4cb..c7c8318282d63dd5d2a1be95cdfe734132fc9348 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -22,32 +22,40 @@
       <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>
-      <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>
@@ -112,8 +120,8 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal-benchmark</artifactId>
-      <version>${feature.benchmark.version}</version>
+      <artifactId>features-extras</artifactId>
+      <version>${feature.controller.extras.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -124,6 +132,14 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal-benchmark</artifactId>
+      <version>${feature.benchmark.version}</version>
+      <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>
@@ -145,6 +161,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
@@ -159,6 +176,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>
@@ -176,7 +200,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>
@@ -195,9 +219,9 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.messaging4transport</groupId>
-      <artifactId>messaging4transport-features</artifactId>
-      <version>${feature.messaging4transport.version}</version>
+      <groupId>org.opendaylight.natapp</groupId>
+      <artifactId>natapp-features</artifactId>
+      <version>${feature.natapp.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -229,6 +253,27 @@
       <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>
     <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
@@ -250,6 +295,28 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ocpplugin</groupId>
+      <artifactId>features-ocpplugin</artifactId>
+      <version>${feature.ocpplugin.version}</version>
+      <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>
       <artifactId>features-of-config</artifactId>
@@ -257,6 +324,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>
@@ -271,51 +339,44 @@
       <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-extension</artifactId>
+      <artifactId>features-openflowplugin-he</artifactId>
       <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${feature.ovsdb.version}</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>library-features</artifactId>
-      <version>${feature.ovsdb.version}</version>
+      <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>southbound-features</artifactId>
+      <artifactId>library-features</artifactId>
       <version>${feature.ovsdb.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>hwvtepsouthbound-features</artifactId>
+      <artifactId>southbound-features</artifactId>
       <version>${feature.ovsdb.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-sfc-features</artifactId>
+      <artifactId>hwvtepsouthbound-features</artifactId>
       <version>${feature.ovsdb.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -327,24 +388,19 @@
       <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>
+    <!-- Remove sdninterfaceapp until they remove their dependency on tcpmd5
     <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>
@@ -376,13 +432,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>features-tcpmd5</artifactId>
-      <version>${feature.tcpmd5.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.topoprocessing</groupId>
       <artifactId>features-topoprocessing</artifactId>
@@ -393,7 +442,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>
@@ -418,6 +467,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>
@@ -425,6 +475,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.vtn</groupId>
       <artifactId>features-vtn-manager</artifactId>
@@ -432,13 +483,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>
@@ -450,7 +494,8 @@
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -461,7 +506,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>
@@ -532,7 +577,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>