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 04813b892b95849fbe1807c788091ea55c291839..c7c8318282d63dd5d2a1be95cdfe734132fc9348 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>
@@ -245,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>
@@ -294,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>
@@ -317,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>
@@ -331,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>
@@ -359,6 +388,7 @@
       <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>
@@ -366,6 +396,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfc</artifactId>
@@ -401,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>
@@ -443,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>
@@ -450,6 +475,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.vtn</groupId>
       <artifactId>features-vtn-manager</artifactId>
@@ -469,6 +495,7 @@
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
       <version>${feature.odlparent.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>