Remove missing karaf4 projects from distribution

Project list: cardinal, tsdr.
Also fix didm reomoval.

Change-Id: I035c025655223351d51c6bb229b0254502c38902
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 5b227c254f2fff2bcb6ae619bdf48d97869127d1..260e7599adaba93391ac4276ead3de4119f94d89 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -110,6 +110,7 @@
                 <type>xml</type>
             </dependency>
             <!-- Cardinal -->
+            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.cardinal</groupId>
                 <artifactId>cardinal-features</artifactId>
@@ -117,6 +118,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -148,7 +150,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <dependency>
                 <groupId>org.opendaylight.didm</groupId>
                 <artifactId>features-didm-hp</artifactId>
@@ -163,6 +164,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
             <!-- Dlux -->
             <dependency>
                 <groupId>org.opendaylight.dlux</groupId>
@@ -476,6 +478,7 @@
                 <type>xml</type>
             </dependency>
             <!-- Tsdr -->
+            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.tsdr</groupId>
                 <artifactId>features-tsdr</artifactId>
@@ -483,6 +486,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
             <!-- Ttp -->
             <dependency>
                 <groupId>org.opendaylight.ttp</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 30900996de59e4d1b01f9df77152cacefa366e45..9d66588ec7f0014969941dc606f783d95c7a5922 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -116,12 +116,14 @@
             <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>
@@ -147,7 +149,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm-hp</artifactId>
@@ -160,6 +161,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>
@@ -402,12 +404,14 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>features-tsdr</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.ttp</groupId>
             <artifactId>features-ttp</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index fb3d6bf5606eeddec908307c568e705a637d97ef..f31ef4851b4cc2faef1f1e6cf5f55f71a72fe715 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -39,7 +39,9 @@
     <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>
@@ -96,7 +98,9 @@
     -->
     <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
+    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/{{VERSION}}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 9fdc034df077cc232903c70cfd74845661de40b1..fc785d8a79deabc3dc8161046bea41fccbe6d179 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -63,7 +63,9 @@
         <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>
         -->
@@ -157,7 +159,9 @@
         <feature>odl-sfc-ios-xe-renderer</feature>
         -->
         <feature>odl-sfc-openflow-renderer</feature>
+        <!-- Temporary remove because of karaf 4
         <feature>odl-tsdr-hsqldb-all</feature>
+        -->
         <feature>odl-unimgr</feature>
         <feature>odl-vtn-manager-neutron</feature>
         <feature>odl-vtn-manager-rest</feature>