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 "BUG 1853 : Clustered Data Store causes Out of Memory"
[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 648e8d23d06892f8964ed65e322b7cb988ee8194..82998226b68e3049093a8be77f96227824db123e 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@
-45,6
+45,11
@@
<artifactId>akka-slf4j_${scala.version}</artifactId>
</dependency>
<artifactId>akka-slf4j_${scala.version}</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-osgi_${scala.version}</artifactId>
+ </dependency>
+
<!-- SAL Dependencies -->
<dependency>
<!-- SAL Dependencies -->
<dependency>
@@
-135,6
+140,15
@@
<version>1.1-SNAPSHOT</version>
</dependency>
<version>1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-graphite</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
@@
-168,10
+182,12
@@
<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.*;!*jetty*;!sun.security.*;*</Import-Package>
+ <!--
<Embed-Dependency>
sal-clustering-commons;
sal-akka-raft;
<Embed-Dependency>
sal-clustering-commons;
sal-akka-raft;
+ *metrics*;
!sal*;
!*config-api*;
!*testkit*;
!sal*;
!*config-api*;
!*testkit*;
@@
-185,6
+201,7
@@
*scala*;
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
*scala*;
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ -->
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-206,7
+223,11
@@
<configuration>
<includes>
<include>org.opendaylight.controller.*</include>
<configuration>
<includes>
<include>org.opendaylight.controller.*</include>
+
</includes>
</includes>
+ <excludes>
+ <exclude>org.opendaylight.controller.config.yang.config.*</exclude>
+ </excludes>
<check>false</check>
</configuration>
<executions>
<check>false</check>
</configuration>
<executions>