Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix raw references to Promise"
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-clustering-commons/pom.xml
b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index a3619ec4d230463edcbf7e15957b230db9d0cb09..f6d7dbab1a32255f2ee24171e410c1170974338d 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/
opendaylight/md-sal/sal-clustering-commons/pom.xml
@@
-5,7
+5,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
2.0
-SNAPSHOT</version>
</parent>
<artifactId>sal-clustering-commons</artifactId>
</parent>
<artifactId>sal-clustering-commons</artifactId>
@@
-55,7
+55,6
@@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@
-111,7
+110,6
@@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@
-131,7
+129,6
@@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-164,6
+161,14
@@
</dependency>
</dependency>
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-osgi_${scala.version}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-actor_${scala.version}</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@
-177,7
+182,6
@@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.5</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-191,13
+195,11
@@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>