From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 29 Jul 2016 05:33:29 +0000 (-0700)
Subject: Add sdninterface back in distribution
X-Git-Tag: release/boron~18
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=36915df583b68967226c605efd4167f8ecf347f0

Add sdninterface back in distribution

They removed tcmpmd5 dependency

Change-Id: I83243015c6af1cbd126ca675e317d4c99acf910c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index ff8111ff..45777eb4 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -421,15 +421,13 @@
             <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>${feature.sdninterfaceapp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-        -->
+        <dependency>
+            <groupId>org.opendaylight.sdninterfaceapp</groupId>
+            <artifactId>features-sdninterfaceapp</artifactId>
+            <version>${feature.sdninterfaceapp.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>features-sfc</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 18073dda..15fa527c 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -87,9 +87,7 @@
     <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>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 152ffa46..b066d6ec 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -110,9 +110,7 @@
         <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>
diff --git a/pom.xml b/pom.xml
index e607f696..9c65cda3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,7 @@
         <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.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>