From: Alexis de Talhouët <adetalhouet@inocybe.com>
Date: Mon, 7 Nov 2016 16:53:03 +0000 (-0500)
Subject: Remove of-config from distribution
X-Git-Tag: release/carbon~63
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F48075%2F2;p=integration%2Fdistribution.git

Remove of-config from distribution

of-config feature file isn't resolved, hance breaking distribution-check all
over OpenDaylight projects.

To be reverted once of-config resolved their issue.

Change-Id: Ib12312f0f867f3db25f08272a6d526e3d8daadae
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index a88a94e4..5ffd04f0 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -354,6 +354,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Commented out, because of-config merge job is failing and there is no artifacts in nexus
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>features-of-config</artifactId>
@@ -361,6 +362,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 9daf94fd..8c3214f2 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -75,7 +75,9 @@
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-akka/${feature.odlparent.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/${feature.odlparent.version}/xml/features</repository>
+    <!-- Commented out, because of-config merge job is failing and there is no artifacts in nexus
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${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 5a93c4cd..dbafea69 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -164,7 +164,9 @@
             which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
         -->
+        <!-- Commented out, because of-config merge job is failing and there is no artifacts in nexus
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
+        -->
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>