Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump mdsal to 4.0.3
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-akka-raft/pom.xml
b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 50442bda5cb9d63023f7acbfaf4f26e255edfa59..89c32f645aa715bc7276a4f58fab810cfd33a325 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/
opendaylight/md-sal/sal-akka-raft/pom.xml
@@
-3,41
+3,46
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>mdsal-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
</parent>
+
+ <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-akka-raft</artifactId>
<artifactId>sal-akka-raft</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>
com.google.guava
</groupId>
- <artifactId>
guava
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
sal-clustering-commons
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_
${scala.version}
</artifactId>
+ <artifactId>akka-actor_
2.12
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-cluster_
${scala.version}
</artifactId>
+ <artifactId>akka-cluster_
2.12
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-persistence
-experimental_${scala.version}
</artifactId>
+ <artifactId>akka-persistence
_2.12
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-remote_
${scala.version}
</artifactId>
+ <artifactId>akka-remote_
2.12
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_${scala.version}</artifactId>
+ <artifactId>akka-testkit_2.12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-50,25
+55,42
@@
<artifactId>scala-library</artifactId>
</dependency>
<artifactId>scala-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_2.12</artifactId>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>
junit
</groupId>
- <artifactId>
junit
</artifactId>
+ <groupId>
org.awaitility
</groupId>
+ <artifactId>
awaitility
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
-
<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>
-
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-81,9
+103,8
@@
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
- <Export-package></Export-package>
- <Private-Package></Private-Package>
- <Import-Package></Import-Package>
+ <Export-package>org.opendaylight.cluster.raft</Export-package>
+ <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-99,37
+120,14
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org.opendaylight.controller.*</include>
- </includes>
- <check>false</check>
- </configuration>
- <executions>
- <execution>
- <id>pre-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>post-test</id>
- <goals>
- <goal>report</goal>
- </goals>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</plugins>
</build>
+
<scm>
<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>
</scm>
<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>
</scm>
+
</project>
</project>