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 7723304e7c220a73701dab25555ff3a66018a5f8..40c1169877e4e7e173f7b2c704572b445f1fafaf 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -12,32 +12,26 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
     <!-- Needed for odl-mdsal-broker -->
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-    <!-- Needed for odl-mdsal-apidocs -->
-    <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.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>
+    <!-- Needed for odl-restconf -->
+    <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>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
 
-    <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${project.version}'>
+    <!--
+    <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
-        <feature version="${project.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
     <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" 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="${restconf.version}">odl-restconf</feature>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-mappingservice.xml">
@@ -47,11 +41,7 @@
 
     <feature name="odl-lispflowmapping-inmemorydb" description="OpenDaylight :: LISP Flow Mapping :: In Memory DB" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-inmemorydb.xml">
             mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}/xml/config
@@ -59,7 +49,9 @@
     </feature>
 
     <feature name="odl-lispflowmapping-southbound" description="OpenDaylight :: LISP Flow Mapping :: Southbound Plugin" version='${project.version}'>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-mappingservice-sb.xml">
             mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}/xml/config
@@ -73,9 +65,20 @@
     </feature>
 
     <feature name="odl-lispflowmapping-ui" description="OpenDaylight :: LISP Flow Mapping :: User Interface" version='${project.version}'>
-        <feature version="${yangtools.version}">odl-yangtools-all</feature>
-        <feature version="${dlux.core.version}">odl-dlux-all</feature>
+        <feature version="${dlux.core.version}">odl-dlux-core</feature>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/${project.version}</bundle>
     </feature>
+    -->
+
+    <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
+        <feature version='${config.version}'>odl-config-api</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+        <!-- Temporary: add APIDOCS so we don't have to load manually while testing IETF LISP address models -->
+        <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
+        <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+    </feature>
 
 </features>