From 1cf1dd917aaa52c0d28e5e1bdc41e6ab57a0c940 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 25 May 2016 12:19:14 +0200
Subject: [PATCH] Remove DIDM from distribution

Their atrifacts got deleted as merge jobs fail due to a change in OpenFlowPlugin.

Also, improved comments.

Change-Id: Icd0c2200ffaef13fc4fe50e3a866dc37fc2e24d2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 features-index/pom.xml                         | 2 ++
 features-index/src/main/resources/features.xml | 4 +++-
 features-test/src/main/resources/features.xml  | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 5d3216b5..170364ba 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -131,6 +131,7 @@
       <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>
@@ -152,6 +153,7 @@
       <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 44ac5acd..b983fb54 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -48,9 +48,11 @@
     <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>
@@ -70,7 +72,7 @@
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
     -->
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
-    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
+    <!-- NIC merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
     -->
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 4750a192..9906754a 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -133,11 +133,12 @@
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
     </feature>
 
-    <!-- Please use aphabetical order for non-compatible features -->
+    <!-- Please use alphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
             which leads to BindException.
+            Also, DIDM merge jobs are currently failing.
         <feature version='${didm.version}'>odl-didm-all</feature>
         -->
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
-- 
2.36.6