Move Cardinal features to not compatible

Cardinal brings l2switch which is a non compatible project.

Change-Id: Iec713a7dd329ea1b5b113e754498038f1d35a8b5
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
(cherry picked from commit 730e0c6bea502b72d25babb7a31d3df736a8149b)

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index e26bc130b362b815944aec972f23683c80a07a7a..fe5b0efbc528fb486f91ef2bb9b63ffd601f6da3 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -68,6 +68,20 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Cardinal -->
+        <dependency>
+            <groupId>org.opendaylight.cardinal</groupId>
+            <artifactId>odl-cardinal-ui</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.cardinal</groupId>
+            <artifactId>odl-cardinal</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- COE -->
         <dependency>
             <groupId>org.opendaylight.coe</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index fbda71e0ca15946fad832f33573be81ee1465a40..95a8282501aef1d74bfd843b0b78e270bb50e614 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -122,20 +122,6 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <!-- Daexim -->
         <dependency>
            <groupId>org.opendaylight.daexim</groupId>