X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=10c80a3c893f15322e885d237d04dbeb29605a4e;hb=refs%2Fchanges%2F69%2F39669%2F2;hp=aefcf94c7520d7ff27e05065c6dd332074336b13;hpb=a473b9d0114ab48384659524617d0f14f472568c;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index aefcf94c..10c80a3c 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -57,28 +57,27 @@
 
     <!-- Please use alphabetical order to add a compatible with all features -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-api</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authn</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authz</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-api</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authn</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
-        <feature version='${feature.alto.version}'>odl-alto-release</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>
@@ -87,41 +86,38 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-neutron</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
-        <feature version='1.4.0-SNAPSHOT'>odl-mdsal-broker</feature>
-        <feature version='${feature.messaging4transport.version}'>odl-messaging4transport-api</feature>
-        <feature version='${feature.messaging4transport.version}'>odl-messaging4transport</feature>
+        <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <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>
         <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
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
-        <feature version='0.8.0-SNAPSHOT'>odl-openflowjava-protocol</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>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-hwvtepsouthbound</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
-        <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
-<!--
-        <feature version="1.7.0-SNAPSHOT">odl-sdninterfaceapp-all</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>
         <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
-<!--
-        Commented out as it leads to Yang parser errors.
         <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
--->
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
         <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
@@ -137,44 +133,42 @@
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</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}'>
-<!--
-        Commented out, because DIDM brings in Li designed OpenFlowPlugin
-        which leads to BindException.
+        <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-all</feature>
--->
+        -->
+        <feature version='${feature.faas.version}'>odl-faas-base</feature>
+        <feature version='${feature.genius.version}'>odl-genius-rest</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 due to an issue with Jetty server
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
-<!--
-        Commented out, because LACP brings in Li designed OpenFlowPlugin
-        which leads to BindException.
+        -->
+        <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.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
--->
-<!--
-        Commented out, because NIC brings in Li designed OpenFlowPlugin
-        which leads to BindException.
-        <feature version='${feature.nic.version}'>odl-nic-core</feature>
--->
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
-        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
-<!--
+        -->
+        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
+        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
+            which leads to BindException.
+        <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>
--->
+        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
         <feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>