Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-4964: Bump to akka-2.4.1
[controller.git]
/
features
/
mdsal
/
pom.xml
diff --git
a/features/mdsal/pom.xml
b/features/mdsal/pom.xml
index a60d8a480e36a2ef90e02351fb2a4a021e47a194..5d31ea2757fe43822c63c16df5d9f70126336fa4 100644
(file)
--- a/
features/mdsal/pom.xml
+++ b/
features/mdsal/pom.xml
@@
-21,7
+21,8
@@
<controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
<config.version>0.5.0-SNAPSHOT</config.version>
<commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
<controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
<config.version>0.5.0-SNAPSHOT</config.version>
<commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
- <akka.version>2.3.14</akka.version>
+ <akka.features.version>1.7.0-SNAPSHOT</akka.features.version>
+ <akka.version>2.4.1</akka.version>
<features.file>features.xml</features.file>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
<config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
<features.file>features.xml</features.file>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
<config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
@@
-34,6
+35,13
@@
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>odlparent-artifacts</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
@@
-68,6
+76,12
@@
<dependencies>
<!-- Required features repositories -->
<dependencies>
<!-- Required features repositories -->
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>features-odlparent</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-yangtools</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-yangtools</artifactId>
@@
-88,9
+102,9
@@
<type>xml</type>
</dependency>
<dependency>
<type>xml</type>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
+ <groupId>org.opendaylight.
odlparent
</groupId>
<artifactId>features-akka</artifactId>
<artifactId>features-akka</artifactId>
- <version>${
commons.opendaylight
.version}</version>
+ <version>${
akka.features
.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
@@
-210,6
+224,13
@@
<type>xml</type>
<classifier>akkaconf</classifier>
</dependency>
<type>xml</type>
<classifier>akkaconf</classifier>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${controller.mdsal.version}</version>
+ <type>xml</type>
+ <classifier>factoryakkaconf</classifier>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-config</artifactId>
@@
-235,6
+256,10
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-distributed-datastore</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-distributed-datastore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-dom-broker-config</artifactId>
+ </dependency>
<!-- message-bus -->
<dependency>
<!-- message-bus -->
<dependency>