BUG 6323: Adding NetIDE to distribution index.

	- Distribution failure fixed with commit https://git.opendaylight.org/gerrit/#/c/42863/

Change-Id: Idb4c7d2ded137a105bb304e6151e6b9032e20d78
Signed-off-by: Giuseppe <giuseppex.petralia@intel.com>
(cherry picked from commit 16bf465c09b7f6380506b67c99dde62469ccdedb)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 2ac3bad9838937e1991911643cec8103c6cc160e..dbcd2e24e0cbdea276a623d3771e986b9220e8cd 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -323,7 +323,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Failed netide merge job makes distribution fail
         <dependency>
             <groupId>org.opendaylight.netide</groupId>
             <artifactId>netide-features</artifactId>
@@ -331,7 +330,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>features-neutron</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 2e0d9806d8d16fa6c8e2f32fc5e6758e3e394966..c3f29b28bf31e069996617275d3b27f5edd9ab4a 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -70,9 +70,7 @@
     <repository>mvn:org.opendaylight.netconf/features-netconf/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
-    <!-- Failed netide merge job makes distribution fail
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>