Revert "Add Cardinal to Karaf 4 distribution"

This caused issues in distribution build.

This reverts commit 8209cabea07eae86ab3b4ba2358afcb9713ed039.

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

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 75a480077dea5e075999fa97e75c367909d110d0..3f2ca59903a6f825834bb1e17221dc7b9b642493 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -68,15 +68,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>cardinal-features4</artifactId>
-                <version>${cardinal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 011d7ccca09300703538397fa3217edcc96a28e1..8d11a4b7bac4e013149783b629a40639e019dadf 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -67,22 +67,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal-ui</artifactId>
-                <version>${cardinal.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal</artifactId>
-                <version>${cardinal.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
             <!-- Dlux Apps -->
             <dependency>
                 <groupId>org.opendaylight.dluxapps</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 1d4b417a43f6a8b0e7ebdeebfc1ae5ddfff81b74..d9a3505a2bc36b776e477f692584d82b702c3fb3 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -137,14 +137,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>cardinal-features4</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- Daexim -->
         <dependency>
             <groupId>org.opendaylight.daexim</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 8b83453e3d6dee25ee8b67267b953c07e8169620..7cda7ff4357701a51452ed0f07438b39251e26ac 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -62,7 +62,7 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- BGPCEP -->
+         <!-- BGPCEP -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-bgp</artifactId>
@@ -88,20 +88,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>