Modify config Module impls to co-exist with blueprint

[controller.git] / features / mdsal / src / main / features / features.xml

diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index 0bbc06b3df009d6887f82d2584c8dc06a144bdd1..897ec4ff18783f40e9f66ab626aae6523ca8e87b 100644 (file)
--- a/features/mdsal/src/main/features/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -13,7 +13,7 @@
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-akka/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.odlparent/features-akka/{{VERSION}}/xml/features</repository>
     <feature name='odl-mdsal-all' version='${project.version}' description="OpenDaylight :: MDSAL :: All">
         <feature version='${project.version}'>odl-mdsal-broker</feature>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
@@ -24,6 +24,7 @@
       <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
       <feature version='${config.version}'>odl-config-api</feature>
       <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+      <bundle>wrap:mvn:net.java.dev.stax-utils/stax-utils/{{VERSION}}</bundle>
       <bundle>mvn:org.opendaylight.controller/sal-common-api/{{VERSION}}</bundle>
       <bundle>mvn:org.opendaylight.controller/sal-common-impl/{{VERSION}}</bundle>
       <bundle>mvn:org.opendaylight.controller/sal-common-util/{{VERSION}}</bundle>
@@ -50,6 +51,7 @@
         <bundle>mvn:org.opendaylight.controller/sal-binding-config/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-inmemory-datastore/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-dom-broker-config/{{VERSION}}</bundle>
+        <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/{{VERSION}}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}">mvn:org.opendaylight.controller/md-sal-config/{{VERSION}}/xml/config</configfile>
     </feature>
     <feature name='odl-toaster' version='${project.version}' description="OpenDaylight :: Toaster">
@@ -69,9 +71,9 @@
     </feature>
     <feature name ='odl-mdsal-clustering-commons' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
-        <feature version='${akka.version}'>odl-akka-system</feature>
-        <feature version='${akka.version}'>odl-akka-persistence</feature>
-        <feature version='${akka.version}'>odl-akka-clustering</feature>
+        <feature version='[2.4.1,2.5.0)'>odl-akka-system</feature>
+        <feature version='[2.4.1,2.5.0)'>odl-akka-persistence</feature>
+        <feature version='[2.4.1,2.5.0)'>odl-akka-clustering</feature>
         <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>
         <bundle>mvn:com.codahale.metrics/metrics-core/3.0.1</bundle>