From 39eb80214a1b75c4f97c735b06111e95a09befe0 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 7 Mar 2016 15:36:23 -0800
Subject: [PATCH] Remove of-config features from master distribution

Distribution check job is failing in master because missing
of-config artifacts in nexus. This is also blocking all the
verify jobs (they run distribution-check).

Change-Id: I8697c89b96d910834590afa8aef6683db7bf917c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 features-index/pom.xml                         | 2 ++
 features-index/src/main/resources/features.xml | 2 ++
 features-test/src/main/resources/features.xml  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 3129f0db..91ac1457 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -257,6 +257,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+<!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
       <artifactId>features-of-config</artifactId>
@@ -264,6 +265,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+-->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 0b52fb74..9085b2a7 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -66,7 +66,9 @@
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+<!-- Issue with of-config merge requires this line commented out:
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
+-->
     <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/${feature.openflowplugin.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index de707b4f..353daf78 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -96,7 +96,9 @@
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
+<!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
+-->
         <feature version='0.8.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
-- 
2.36.6