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 b0dd72832fc6a59df93fae6e6330bcee1166540b..40c1169877e4e7e173f7b2c704572b445f1fafaf 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -21,6 +21,7 @@
     <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>
 
+    <!--
     <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>
@@ -68,10 +69,13 @@
         <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>