Add didm back to distribution

Change-Id: I4ee745bd553cecd3c24bb159326422f317d28225
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 c663be13839f3df5e2052ae9f1e2ea3af9cb7fd9..9d2d47f2ab3a5669459b765cd782f0a666b8b433 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -140,7 +140,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Didm -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.didm</groupId>
                 <artifactId>features-didm</artifactId>
@@ -162,7 +161,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Dlux -->
             <dependency>
                 <groupId>org.opendaylight.dlux</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index d88960bc2b56aa5ba4e49bff9eb9f46f5a243f20..53caad82467d335f61054903f70bb90f1d658a8c 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -140,7 +140,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm</artifactId>
@@ -159,7 +158,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 3117708dac6ca551f6928797c8c153993afd439e..c4e6d40bce70141d6d182615b928f728e85aef66 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -43,11 +43,9 @@
     <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>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.didm/features-didm/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-hp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-ovs/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.eman/eman-features/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 1271326c8e5eb7aa67ec2d954911c4314bb18f50..a1f7fda2bf3292b1e41992fa085a383348ac1d9f 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -64,9 +64,7 @@
         <feature>odl-bgpcep-pcep-all</feature>
         <feature>odl-bgpcep-rsvp</feature>
         <feature>odl-cardinal</feature>
-        <!-- Temporary remove because of karaf 4
         <feature>odl-didm-all</feature>
-        -->
         <feature>odl-dlux-core</feature>
         <feature>odl-distribution-version</feature>
         <feature>odl-eman</feature>