Merge "Adding TSDR features to integration project."

diff --git a/features/index/pom.xml b/features/index/pom.xml
index d8f7e34ab73f981e81da4259d2f40e66ccb46035..56685f3b0d0180a709695669465952f98638cfb2 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -300,6 +300,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.tsdr</groupId>
+      <artifactId>features-tsdr</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ttp</groupId>
       <artifactId>features-ttp</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 03eaf34d6176f48fe3ef8e600a4bfab16bd75a21..1964049412c6e8aee09c29055528947347c5a58c 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -73,6 +73,7 @@
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/0.2.0-SNAPSHOT/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>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 0eb976f53f521ca4986813c2ce4151cb68028918..da9fed4815186bd5c79223d59e6f884ebc764f87 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -121,6 +121,7 @@
         <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
         <!--<feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>-->
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
+        <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>

diff --git a/pom.xml b/pom.xml
index a17b42aa70996792d7c0578605bbffb6899e5fd9..4ee15ba5a1fffd4ed0081cd02a626ba6bb8a1db8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.0.1-SNAPSHOT</feature.topoprocessing.version>
+    <feature.tsdr.version>1.0-SNAPSHOT</feature.tsdr.version>
     <feature.ttp.version>0.1.0-SNAPSHOT</feature.ttp.version>
     <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>
     <feature.vpnservice.version>1.0-SNAPSHOT</feature.vpnservice.version>