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 "Moving common code out of remote rpc to clustering common bundle"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 3dd44bb8504d530b030da962a2636fa415e293f0..08262c10888667f485346cd98f2623e0297d4fd9 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@
-40,6
+40,11
@@
<artifactId>akka-testkit_${scala.version}</artifactId>
</dependency>
<artifactId>akka-testkit_${scala.version}</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_${scala.version}</artifactId>
+ </dependency>
+
<!-- SAL Dependencies -->
<dependency>
<!-- SAL Dependencies -->
<dependency>
@@
-120,7
+125,13
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-protocolbuffer-encoding</artifactId>
+ <artifactId>sal-clustering-commons</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-akka-raft</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<version>1.1-SNAPSHOT</version>
</dependency>
@@
-157,8
+168,10
@@
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-package></Export-package>
<Private-Package></Private-Package>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-package></Export-package>
<Private-Package></Private-Package>
- <Import-Package>!*snappy;!org.jboss.*;*</Import-Package>
+ <Import-Package>!*snappy;!org.jboss.*;
!com.jcraft.*;
*</Import-Package>
<Embed-Dependency>
<Embed-Dependency>
+ sal-clustering-commons;
+ sal-akka-raft;
!sal*;
!*config-api*;
!*testkit*;
!sal*;
!*config-api*;
!*testkit*;