Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove duplicate dependency declaration
[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 08262c10888667f485346cd98f2623e0297d4fd9..cbaf278a87eda3944bac8c838625165f55667916 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@
-4,7
+4,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-distributed-datastore</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>sal-distributed-datastore</artifactId>
<packaging>bundle</packaging>
@@
-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>
@@
-75,7
+80,6
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-inmemory-datastore</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-inmemory-datastore</artifactId>
- <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-108,11
+112,6
@@
<artifactId>yang-common</artifactId>
</dependency>
<artifactId>yang-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-data-api</artifactId>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@
-126,15
+125,23
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-commons</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-clustering-commons</artifactId>
- <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-raft</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-raft</artifactId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
2.0
-SNAPSHOT</version>
</dependency>
</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>
@@
-150,7
+157,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>
<scope>test</scope>
</dependency>
@@
-168,10
+174,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.*;!com.jcraft.*;*</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
+193,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
+215,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>