Remove netide from distribution

Failed netide merge job makes distribution fail.

Change-Id: Ia7bdada443050261116c1596ef61adf139bdff95
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 45777eb4ecd82b1ccdd9ff5b89d88ae3fbc5b7cd..ef5bbf0d5e5851ad7fd1e96baa3bff6ef529679d 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -309,6 +309,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Failed netide merge job makes distribution fail
         <dependency>
             <groupId>org.opendaylight.netide</groupId>
             <artifactId>netide-features</artifactId>
@@ -316,6 +317,7 @@
             <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 15fa527cf4287744d7073b2ebebcb6c77cfbaf20..83f0ff1704d94b2ccc7f484ccfee56366501e2e2 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -68,7 +68,9 @@
     <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>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index b066d6ec3d1f6a218f1ad211cf0a1f7448dc716e..bd369f5718d7cb9d9b3b12a18e43c48f9576d349 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -97,8 +97,10 @@
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
+        <!-- Failed netide merge job makes distribution fail
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
+        -->
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>