X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=08352a9ae5ed66310f9c039ef48cfc78d7a3bd5d;hb=2e21f444acc7c463a811a6faab795c2882314f36;hp=83f0ff1704d94b2ccc7f484ccfee56366501e2e2;hpb=c94af07ca1d9f4b6ea9cf8345ec436064f46f722;p=integration%2Fdistribution.git

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 83f0ff17..08352a9a 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
  Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
@@ -31,20 +31,17 @@
 
     <!-- Please add new repository in an alphabetical order -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-api/${feature.aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
-    <!-- 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 -->
-    <!-- <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.atrium/atrium-features/${feature.atrium.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bier/features-bier/${feature.bier.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.cardinal/cardinal-features/${feature.cardinal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
     <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>
@@ -53,10 +50,12 @@
     <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.dluxapps/features-dluxapps/${feature.dluxapps.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.eman/eman-features/${feature.eman.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.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/${feature.honeycomb.vbd.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.infrautils/infrautils-features/${feature.infrautils.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.integration/features-distribution/${project.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/onem2m-features/${feature.iotdm.version}/xml/features</repository>
@@ -68,11 +67,10 @@
     <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/openstack.sfc-translator-features/${feature.netvirt.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>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
@@ -80,7 +78,6 @@
     <repository>mvn:org.opendaylight.odlparent/features-akka/${feature.odlparent.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/${feature.odlparent.version}/xml/features</repository>
     <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-he/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
@@ -89,7 +86,9 @@
     <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
+    <!-- No snapshot artifacts available due to Bug 7404
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>