Add tsdr back to distribution

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

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 44a76a7a9bce74c0fe5fd87c837ddbdf27c76b9f..c663be13839f3df5e2052ae9f1e2ea3af9cb7fd9 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -468,7 +468,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Tsdr -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.tsdr</groupId>
                 <artifactId>features-tsdr</artifactId>
@@ -476,7 +475,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Ttp -->
             <dependency>
                 <groupId>org.opendaylight.ttp</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index fe509791f2c30651f7a18d204862695d9ae9bfe1..d88960bc2b56aa5ba4e49bff9eb9f46f5a243f20 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -394,14 +394,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>features-tsdr</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.ttp</groupId>
             <artifactId>features-ttp</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 0d408352d3fda73de0835f3cfdcb546cfc5455c3..3117708dac6ca551f6928797c8c153993afd439e 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -88,9 +88,7 @@
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index fe29619a1cd519b93c5d19600815c671d90665f6..1271326c8e5eb7aa67ec2d954911c4314bb18f50 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -150,9 +150,7 @@
         <feature>odl-sfc-ios-xe-renderer</feature>
         -->
         <feature>odl-sfc-openflow-renderer</feature>
-        <!-- Temporary remove because of karaf 4
         <feature>odl-tsdr-hsqldb-all</feature>
-        -->
         <feature>odl-unimgr</feature>
         <feature>odl-vtn-manager-neutron</feature>
         <feature>odl-vtn-manager-rest</feature>