Add Cardinal to Karaf 4 distribution

Change-Id: I71f52aea6536f42267322d2a6e2a9ff9542f61cd
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 3f2ca59903a6f825834bb1e17221dc7b9b642493..75a480077dea5e075999fa97e75c367909d110d0 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -68,6 +68,15 @@
                 <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 0805a5e1bf2f731015e25998d6fe7b53c53b41f7..7756b129701c10c2cc29223ed3db4931f2007eec 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -67,6 +67,22 @@
                 <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 636350ced66d3ce8240d1d4e50aa0374c188d360..013edbfa52d1c97bd3cd0fa96309e70287db6672 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -137,6 +137,14 @@
             <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 0d77393bf8541261e76fdb168d792bd61336b560..49de2c8ca43503ab37677425ff1663b1892a179c 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,6 +88,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>
+
         <!-- Daexim -->
         <dependency>
            <groupId>org.opendaylight.daexim</groupId>