Remove tcpmd5 from distribution Boron

tcpmd5 is not participating in the Boron release so remove them from the
build.

Also remove sdninterfaceapp until they are able to compile without
depending on tcpmd5.

Change-Id: I4b78cbe6e70eb85278c0f395224ad1fbb06580fd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 0924b7621a93472056ac77b30879e34e757b0092..c7c8318282d63dd5d2a1be95cdfe734132fc9348 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -388,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>
@@ -395,6 +396,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfc</artifactId>
@@ -430,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>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 23028335a04fa15217d440a7997f0319f1763314..20f8c3c9a8171d467aeb494c14286cc64cc8200a 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -88,13 +88,14 @@
     <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
+    <!-- Remove sdninterfaceapp until they remove their dependency on tcpmd5.
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/${feature.snmp4sdn.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sxp/features/${feature.sxp.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${feature.tcpmd5.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/${feature.tsdr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index fd382774983c11fee9bb893b7474db7092458551..6d3b68b40fd5bc76b4181653f13b9686cc35ce1a 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -107,7 +107,9 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
+        <!-- Remove sdninterfaceapp until they remove their dependency on tcpmd5
         <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+        -->
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
         <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
@@ -119,7 +121,6 @@
         <!-- Issues with yang parser show up in aaa distribution-check
         <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         -->
-        <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>

diff --git a/pom.xml b/pom.xml
index fbb5d9ed3d8af92ed455dc5c1d903793c4191f41..af75d2c14ba57a67cc0c2c5ba45f5ee28b721704 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,13 @@
     <feature.ovsdb.version>1.3.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.4.0-SNAPSHOT</feature.packetcable.version>
     <feature.restconf.version>1.4.0-SNAPSHOT</feature.restconf.version>
+    <!-- remove sdninterfaceapp until they remove their dependency on tcpmd5
     <feature.sdninterfaceapp.version>1.7.0-SNAPSHOT</feature.sdninterfaceapp.version>
+    -->
     <feature.sfc.version>0.3.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.3.0-SNAPSHOT</feature.snbi.version>
     <feature.snmp4sdn.version>0.4.0-SNAPSHOT</feature.snmp4sdn.version>
     <feature.sxp.version>1.3.0-SNAPSHOT</feature.sxp.version>
-    <feature.tcpmd5.version>1.3.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.2.0-SNAPSHOT</feature.topoprocessing.version>
     <feature.tsdr.version>1.2.0-SNAPSHOT</feature.tsdr.version>
     <feature.ttp.version>0.3.0-SNAPSHOT</feature.ttp.version>