<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
<dependency>
<groupId>org.opendaylight.didm</groupId>
<artifactId>features-didm</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>features-dlux</artifactId>
<repository>mvn:org.opendaylight.controller/features-extras/${feature.controller.extras.version}/xml/features</repository>
<repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
<repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
+ <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
<repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
<repository>mvn:org.opendaylight.didm/features-didm-hp/${didm.version}/xml/features</repository>
<repository>mvn:org.opendaylight.didm/features-didm-ovs/${didm.version}/xml/features</repository>
+ -->
<repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
<repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
<repository>mvn:org.opendaylight.genius/genius-features/${feature.genius.version}/xml/features</repository>
<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
+ <!-- NIC merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
<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>
<feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
</feature>
- <!-- Please use aphabetical order for non-compatible features -->
+ <!-- Please use alphabetical 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.
+ Also, DIDM merge jobs are currently failing.
<feature version='${didm.version}'>odl-didm-all</feature>
-->
<feature version='${feature.faas.version}'>odl-faas-base</feature>