Comment-out NIC as its artifacts are not being built

Also vpnservice-features from netvirt project are commented out,
as they depend on NIC.

Comment formatting improved.

Change-Id: I16a178434aec753c41a5d5e7b32c94a0517b5e0b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 800a1b8372fa408658caae2bc6a4acb71ff2043f..da2a9ddd260e3c84ca09919df94d34d70826fa4d 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -243,6 +243,7 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+    <!-- Depends on NIC, which is commented-out
      <dependency>
        <groupId>org.opendaylight.netvirt</groupId>
        <artifactId>vpnservice-features</artifactId>
@@ -250,6 +251,7 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+    -->
      <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
@@ -264,6 +266,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
     <dependency>
       <groupId>org.opendaylight.nic</groupId>
       <artifactId>features-nic</artifactId>
@@ -271,6 +274,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>org.opendaylight.ocpplugin</groupId>
       <artifactId>features-ocpplugin</artifactId>
@@ -278,7 +282,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!-- Issue with of-config merge requires this line commented out:
+    <!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
       <artifactId>features-of-config</artifactId>
@@ -286,7 +290,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 7e277a0e433d9f28eed2204932bf67a56e0e9f74..3bcc5db6d027d999b717b7d47646c07d9990a845 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -65,13 +65,17 @@
     <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>
+    <!-- Depends on NIC, which is commented-out.
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
+    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
-<!-- Issue with of-config merge requires this line commented out:
+    <!-- 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 e0dcd2a196b30c28989d97a9f6163b7a44725c22..58f1565c8c7c54a02526e74b86ea8f08433e41ac 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -63,21 +63,21 @@
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
         <!-- Remove Armoury from Beryllium release as per as committers consent:
-        https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-        Need to be uncommented once in Boron -->
-        <!-- <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature> -->
+            https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
+            Needs to be uncommented once in Boron
+        <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
+        -->
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
         <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
-<!--
-        Commented out because two of the features lead to Yang pares errors.
+        <!-- Commented out because two of the features lead to Yang pares errors.
         <feature version='${feature.centinel.version}'>odl-centinel-core</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-laas</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-streamhandler</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-ui</feature>
--->
+        -->
         <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
         <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
         <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
@@ -94,9 +94,9 @@
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-<!-- Issue with of-config merge requires this line commented out
+        <!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
--->
+        -->
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
@@ -106,9 +106,9 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
-<!--
+        <!-- The reason why sdninterfaceapp is commented-out has been lost in time.
         <feature version="${feature.sdninterfaceapp.version}">odl-sdninterfaceapp-all</feature>
--->
+        -->
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
         <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
@@ -136,32 +136,33 @@
     <!-- Please use aphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
-<!--
-        Commented out, because DIDM brings in Li designed OpenFlowPlugin
-        which leads to BindException.
+        <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
+            which leads to BindException.
         <feature version='${didm.version}'>odl-didm-all</feature>
--->
+        -->
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
-<!--
-        commenting this feature because issue with Jetty server
+        <!-- Commenting this feature due to an issue with Jetty server
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
--->
+        -->
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch</feature>
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch-rest</feature>
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch-ui</feature>
-<!--
-        Commented out, because LACP brings in Li designed OpenFlowPlugin
-        which leads to BindException.
+        <!-- Commented out, because LACP brings in Li designed OpenFlowPlugin
+            which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
+        -->
+        <!-- Depends on NIC, which is commented out.
         <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
-        Commented out, because NIC brings in Li designed OpenFlowPlugin
-        which leads to BindException.
+        -->
+        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
+            which leads to BindException.
+            Also, NIC merge jobs are currently failing.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</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>