X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fmdsal%2Fsrc%2Fmain%2Ffeatures%2Ffeatures.xml;h=1ba88d395bd16d62861e06585ca276daf0ded6b0;hb=8438f3659c2b70ecb66af27684781b34bcfa328f;hp=ca5593d99368a9874e43b6a6eeef0b605f5a657b;hpb=6c4137eab4bb0fdae7af9b4947e606a9a6266759;p=controller.git

diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index ca5593d993..1ba88d395b 100644
--- a/features/mdsal/src/main/features/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -32,17 +32,22 @@
 
     <feature name='odl-mdsal-broker-local' version='${project.version}' description="OpenDaylight :: MDSAL :: Broker">
         <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-binding-dom-adapter</feature>
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <feature version='${project.version}'>odl-mdsal-common</feature>
         <feature version='${config.version}'>odl-config-startup</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
-        <feature version='[3.3.0,4.0.0)'>odl-lmax</feature>
+        <feature version="${odlparent.version}">odl-lmax-3</feature>
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
+        <feature version='${mdsal.version}'>odl-mdsal-dom</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-eos-dom</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-eos-binding</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-singleton-dom</feature>
         <bundle>mvn:org.opendaylight.controller/sal-core-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-core-spi/{{VERSION}}</bundle>
-        <bundle start-level="70">mvn:org.opendaylight.controller/sal-broker-impl/{{VERSION}}</bundle>
+        <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-broker-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-binding-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-binding-broker-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-binding-util/{{VERSION}}</bundle>
@@ -61,7 +66,6 @@
         <bundle>mvn:org.opendaylight.controller.samples/sample-toaster/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-consumer/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-provider/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.toaster.configfile}">mvn:org.opendaylight.controller.samples/toaster-config/{{VERSION}}/xml/config</configfile>
     </feature>
     <feature name ='odl-mdsal-xsql' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker</feature>
@@ -71,28 +75,32 @@
     </feature>
     <feature name ='odl-mdsal-clustering-commons' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</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>
+        <feature version="${odlparent.version}">odl-akka-system-2.4</feature>
+        <feature version="${odlparent.version}">odl-akka-persistence-2.4</feature>
+        <feature version="${odlparent.version}">odl-akka-clustering-2.4</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>
+        <bundle>mvn:io.dropwizard.metrics/metrics-core/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-distributed-datastore' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
         <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>
+        <bundle>mvn:org.opendaylight.controller/cds-access-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/cds-access-client/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-distributed-datastore/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-cluster-admin-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-cluster-admin-impl/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-remoterpc-connector' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
         <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>
-        <feature version='0.7'>odl-akka-leveldb</feature>
+        <feature version="${odlparent.version}">odl-akka-leveldb-0.7</feature>
         <bundle>mvn:org.opendaylight.controller/sal-remoterpc-connector/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-broker' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-remoterpc-connector</feature>
         <feature version='${project.version}'>odl-mdsal-distributed-datastore</feature>
-        <configfile finalname="${config.configfile.directory}/${config.clustering.configfile}">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/${config.clustering.configfile}" override="true" >mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/${config.clustered-entity-ownership.configfile}">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/entityownershipconfig</configfile>
         <configfile finalname="configuration/initial/akka.conf">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/akkaconf</configfile>
         <configfile finalname="configuration/factory/akka.conf" override="true">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/factoryakkaconf</configfile>
@@ -108,7 +116,6 @@
         <feature version='${project.version}'>odl-mdsal-broker</feature>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-model/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-provider/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/20-clustering-test-app.xml">mvn:org.opendaylight.controller.samples/clustering-it-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <feature name='odl-message-bus-collector' version='${project.version}'>