Move tsdr features to not compatible

Currently they bring l2switch which breaks OFP test.

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

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index c80b3575734faa50d0a0acfcbe03f2359fed8159..016b45e269bfe9d13f75689992621e197f159f93 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -330,6 +330,14 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- TSDR -->
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>odl-tsdr-hsqldb-all</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- Unimgr -->
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index c3e53fa5fde6aa5b9f39c6ca36aff4ecfd1e67bf..bb75398a414b417fdd69eed8ab2ada0bf0212aa5 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -332,13 +332,5 @@
             <type>xml</type>
         </dependency>
 
-        <!-- TSDR -->
-        <dependency>
-            <groupId>org.opendaylight.tsdr</groupId>
-            <artifactId>odl-tsdr-hsqldb-all</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
     </dependencies>
 </project>