Add Karaf3 Iotdm repository back

The feature is still commented-out,
as the stated reason was not eqal to "Karaf 4".

Change-Id: I5f155692d546794f168a0f7242119b71c422aa27
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 102ef9dd7eb9594a4f346157ec7e9db4081aa4a9..7c50e5f31dc98c2e395fc3d85bde0eab1afc4585 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -238,7 +238,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Iotdm -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.iotdm</groupId>
                 <artifactId>iotdmcsitdist-features</artifactId>
@@ -246,7 +245,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- L2switch -->
             <dependency>
                 <groupId>org.opendaylight.l2switch</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 5fe4df59455cb1ac8436e7757f7db71fd9932257..35572d8b28a761b78af886b04aa85df2dd7d6e28 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -216,14 +216,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.iotdm</groupId>
             <artifactId>iotdmcsitdist-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.l2switch</groupId>
             <artifactId>features-l2switch</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index ba093a41536481ef87ccec145e9218c6d69cd397..26f0875f46ba5fd727c615dcc8113c91a7543da2 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -60,9 +60,7 @@
     <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.infrautils/infrautils-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.integration/features3-distribution/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.iotdm/iotdmcsitdist-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
     <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features</repository>