Merge branch 'master' into topic/ietf_yang

[lispflowmapping.git] / features / src / main / features / features.xml

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 14c622482d81591110983d52d3336dfe6999ada5..40c1169877e4e7e173f7b2c704572b445f1fafaf 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -18,8 +18,6 @@
     <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <!-- Needed for odl-config-api -->
     <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
-    <!-- TODO features-base should be removed when we get rid of Activators, hopefully soon -->
-    <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
 
@@ -61,8 +59,6 @@
     </feature>
 
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
-         TODO felix-dm should be removed when we get rid of Activators, hopefully soon
-        <feature>odl-base-felix-dm</feature>
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${project.version}</bundle>