From: subhash kumar singh <subh.singh007@gmail.com>
Date: Tue, 26 Jul 2016 07:29:52 +0000 (+0530)
Subject: Enable the DIDM in Boron distribution
X-Git-Tag: release/boron~24
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=be2a43f733f5c87d0f65273187a8854131aac3a1;p=integration%2Fdistribution.git

Enable the DIDM in Boron distribution

Enable the DIDM in Boron distribution. Earlier DIDM was failing to
build because of missing method, which is now fixed.

Change-Id: I8bcd1add3aed73fb49e2f851ad912bed5f6971d2
Signed-off-by: subhash kumar singh <subh.singh007@gmail.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 20d9ada6..8772d3af 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -155,7 +155,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
         <dependency>
             <groupId>org.opendaylight.didm</groupId>
             <artifactId>features-didm</artifactId>
@@ -177,7 +176,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 087ea451..aa8b9d21 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -48,11 +48,9 @@
     <repository>mvn:org.opendaylight.controller/features-extras/${feature.controller.extras.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
-    <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
     <repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-hp/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-ovs/${didm.version}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.genius/genius-features/${feature.genius.version}/xml/features</repository>