From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 11 May 2017 17:13:37 +0000 (+0200)
Subject: Add Karaf3 Iotdm repository back
X-Git-Tag: release/carbon~8
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=217199b05266ace51cc5db7ee6d21e461075c3d8

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 102ef9dd..7c50e5f3 100644
--- 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 5fe4df59..35572d8b 100644
--- 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 ba093a41..26f0875f 100644
--- 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>