Add cardinal back to distribution

Change-Id: I8bed5a5c08effddea2ee97d596f2e79aae5f37ff
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 fa82493ee2aefdfcc5cef26d7b6a31f77a5efb8d..44a76a7a9bce74c0fe5fd87c837ddbdf27c76b9f 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -110,7 +110,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Cardinal -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.cardinal</groupId>
                 <artifactId>cardinal-features</artifactId>
@@ -118,7 +117,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 90af909504d855a3c004f5720a77d712f591a5bd..fe509791f2c30651f7a18d204862695d9ae9bfe1 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -116,14 +116,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.cardinal</groupId>
             <artifactId>cardinal-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-extras</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index e6db1fdea2fa0a1361e71b27088e8b3078d0922f..0d408352d3fda73de0835f3cfdcb546cfc5455c3 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -39,9 +39,7 @@
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 5119827fa961c138295eadd3a0ce8aa89badc239..fe29619a1cd519b93c5d19600815c671d90665f6 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -63,9 +63,7 @@
         <feature>odl-bgpcep-bmp</feature>
         <feature>odl-bgpcep-pcep-all</feature>
         <feature>odl-bgpcep-rsvp</feature>
-        <!-- Temporary remove because of karaf 4
         <feature>odl-cardinal</feature>
-        -->
         <!-- Temporary remove because of karaf 4
         <feature>odl-didm-all</feature>
         -->