Merge "BUG-2082: add integration test"

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 8fe985b6b609af292c9e67edc079bfc363c0894c..a5d369ad21115cec4839adcb4dc5baf09b844c83 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -75,6 +75,7 @@
     <repository>mvn:org.opendaylight.sfc/features-sfcofl2/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/0.1.3-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${feature.tcpmd5.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
 
@@ -105,6 +106,7 @@
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
         <feature version='0.1.3-SNAPSHOT'>odl-snmp4sdn-all</feature>
+        <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->

diff --git a/pom.xml b/pom.xml
index c8594a9227f4322501dd6f0da7b86ae981a594dd..62fee04ee3aa0159688b3bb25ba2676ac4eb4d89 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <feature.bgp.version>0.3.1-SNAPSHOT</feature.bgp.version>
     <feature.packetcable.version>1.1-SNAPSHOT</feature.packetcable.version>
     <feature.plugin2oc.version>0.1-SNAPSHOT</feature.plugin2oc.version>
+    <feature.tcpmd5.version>1.0.0-SNAPSHOT</feature.tcpmd5.version>
     <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>
     <karaf.version>3.0.1</karaf.version>
     <maven.surefire.version>2.16</maven.surefire.version>
@@ -199,6 +200,14 @@
           <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.bgpcep</groupId>
           <artifactId>features-bgp</artifactId>