Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CDS: Change operationTimeout units to millis
[controller.git]
/
opendaylight
/
md-sal
/
sal-dummy-distributed-datastore
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index d8d1a76a70f4db9c41f3e94255101f07eb4cbd8d..ac8190573b0d20f5edbef6ff9aef0f2df77d4709 100644
(file)
--- a/
opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/
opendaylight/md-sal/sal-dummy-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.
2
.0-SNAPSHOT</version>
+ <version>1.
3
.0-SNAPSHOT</version>
</parent>
<artifactId>sal-dummy-distributed-datastore</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>sal-dummy-distributed-datastore</artifactId>
<packaging>bundle</packaging>
@@
-58,9
+58,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-raft</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-raft</artifactId>
- <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-distributed-datastore</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
<!-- Test Dependencies -->
<dependency>
@@
-77,7
+80,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>
@@
-87,12
+89,6
@@
<version>2.0.29</version>
</dependency>
<version>2.0.29</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.7</version>
- </dependency>
-
</dependencies>
<build>
</dependencies>
<build>
@@
-174,7
+170,6
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
<executions>
<execution>
<phase>package</phase>
@@
-206,7
+201,7
@@
</plugins>
</build>
<scm>
</plugins>
</build>
<scm>
- <connection>scm:git:
ssh://git.opendaylight.org:29418
/controller.git</connection>
+ <connection>scm:git:
http://git.opendaylight.org/gerrit
/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>