From: Alexis de Talhouët <adetalhouet@inocybe.com>
Date: Tue, 8 Nov 2016 14:21:17 +0000 (-0500)
Subject: Revert "Remove of-config from distribution"
X-Git-Tag: release/carbon~62
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=b34e0b639ced1a5457d8c595e3a8f135dd6020c2

Revert "Remove of-config from distribution"

This reverts commit 3f1ca5fbfeb26a6326aaa8e4de1147570356ddd6.

Fix was merged and artifacts were published successfully.

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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 5ffd04f0..a88a94e4 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -354,7 +354,6 @@
             <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>
@@ -362,7 +361,6 @@
             <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 8c3214f2..9daf94fd 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -75,9 +75,7 @@
     <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 dbafea69..5a93c4cd 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -164,9 +164,7 @@
             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>