Bug 4424: Remove non-existing features-base

Change-Id: I637092ce4820df6ce8435377f5361faaec2f59af
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 23a4bc5830d6afc46c6ec4d2633b0e5879c43b68..00b91d5b5b5b7fba3748bb89dbb3308abe82e123 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -66,13 +66,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-base</artifactId>
-      <version>${commons.opendaylight.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 3055fea698837a56d4f979cdffce15fd9c94ac94..b0dd72832fc6a59df93fae6e6330bcee1166540b 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>
 
@@ -60,8 +58,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>