Bump to odlparent 3.1.0 and yangtools 2.0.3

[controller.git] / features / mdsal / odl-mdsal-broker-local / src / main / feature / feature.xml

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index c808b4859bbaf37987a84518c13ad5eb38fd8379..9301be6ee29a9b092ffa1b3b8a0005c0cf32d117 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -7,12 +7,12 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
 <features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <!-- This needs to be added manually until we resolve the odl-mdsal-common situation -->
-    <repository>mvn:org.opendaylight.controller/odl-mdsal-common/${project.version}/xml/features</repository>
     <feature name="odl-mdsal-broker-local" version="${project.version}">
+        <feature version="[3.1.0,4)">odl-lmax-3</feature>
+        <feature version="[2.0.3,3)">odl-yangtools-codec</feature>
         <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/${project.version}</bundle>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}">
+        <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}" override="true">
             mvn:org.opendaylight.controller/md-sal-config/${project.version}/xml/config
         </configfile>
     </feature>