Merge "Adding TSDR features to integration project."

diff --combined features/index/pom.xml
index d8f7e34ab73f981e81da4259d2f40e66ccb46035,9842e91a6876033478b025fd73f7611e3746ce59..56685f3b0d0180a709695669465952f98638cfb2
--- 1/features/index/pom.xml
--- 2/features/index/pom.xml
+++ b/features/index/pom.xml
@@@ -300,6 -300,13 +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>
@@@ -353,6 -360,7 +360,6 @@@
           <plugin>
              <groupId>org.apache.karaf.tooling</groupId>
              <artifactId>karaf-maven-plugin</artifactId>
 -            <version>${karaf.version}</version>
              <extensions>true</extensions>
              <executions>
                 <execution>

diff --combined features/test/src/main/resources/features.xml
index 0eb976f53f521ca4986813c2ce4151cb68028918,d2c394300fa22d98d68c3f1ce478162602a361b6..da9fed4815186bd5c79223d59e6f884ebc764f87
--- 1/features/test/src/main/resources/features.xml
--- 2/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@@ -106,6 -106,7 +106,6 @@@
          <feature version='${feature.usc.version}'>odl-usc-channel</feature>
          <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
          <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
 -        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
      </feature>
  
      <!-- Please use aphabetical order for non-compatible features -->
@@@ -121,8 -122,8 +121,9 @@@
          <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>
  
  </features>