Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modernize sal-akka-raft tests
[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 52a8c1548bf65a37e5b63fa1322b0da17abf5203..f2bceddef9a11db0ce65db8bade114e0d962b386 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/
opendaylight/md-sal/sal-akka-raft/pom.xml
@@
-4,71
+4,55
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-parent</artifactId>
- <version>
1.10.0
-SNAPSHOT</version>
+ <version>
7.0.5
-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<relativePath>../parent</relativePath>
</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>
org.opendaylight.controller
</groupId>
- <artifactId>
sal-clustering-commons
</artifactId>
+ <groupId>
com.google.guava
</groupId>
+ <artifactId>
guava
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-actor_2.12
</artifactId>
+ <groupId>
org.opendaylight.yangtools
</groupId>
+ <artifactId>
concepts
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-cluster_2.12
</artifactId>
+ <groupId>
org.opendaylight.yangtools
</groupId>
+ <artifactId>
util
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-persistence_2.12
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
sal-clustering-commons
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-remote_2.12
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
cds-mgmt-api
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_2.12</artifactId>
- <scope>test</scope>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>repackaged-akka</artifactId>
</dependency>
</dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
-
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <!-- Test Dependencies -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-
slf4j_2.12
</artifactId>
+ <artifactId>akka-
testkit_2.13
</artifactId>
</dependency>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<dependency>
- <groupId>org.
mockito
</groupId>
- <artifactId>
mockito-core
</artifactId>
+ <groupId>org.
awaitility
</groupId>
+ <artifactId>
awaitility
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-81,16
+65,10
@@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
</dependencies>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@
-103,9
+81,7
@@
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
-
<plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@
-115,6
+91,16
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</plugins>
</build>
@@
-124,5
+110,4
@@
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
</scm>
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
</scm>
-
</project>
</project>