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 versions to 4.0.8-SNAPSHOT
[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..eadd0df09e486544af523799a6cb27d313767fa4 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/
opendaylight/md-sal/sal-akka-raft/pom.xml
@@
-3,77
+3,69
@@
<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>4.0.8-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
</parent>
+
<artifactId>sal-akka-raft</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<artifactId>sal-akka-raft</artifactId>
<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>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-actor_${scala.version}
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
cds-mgmt-api
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-cluster_${scala.version}
</artifactId>
+ <groupId>
org.opendaylight.controller
</groupId>
+ <artifactId>
repackaged-akka
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-persistence-experimental_${scala.version}
</artifactId>
+ <groupId>
org.scala-lang
</groupId>
+ <artifactId>
scala-library
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-remote_${scala.version}
</artifactId>
+ <groupId>
org.apache.commons
</groupId>
+ <artifactId>
commons-lang3
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-testkit_${scala.version}
</artifactId>
+ <groupId>
org.osgi
</groupId>
+ <artifactId>
osgi.core
</artifactId>
</dependency>
</dependency>
+ <!-- Test Dependencies -->
<dependency>
<dependency>
- <groupId>
org.osgi
</groupId>
- <artifactId>
org.osgi.core
</artifactId>
+ <groupId>
com.typesafe.akka
</groupId>
+ <artifactId>
akka-testkit_2.13
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
</dependency>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<dependency>
- <groupId>
junit
</groupId>
- <artifactId>
junit
</artifactId>
+ <groupId>
org.slf4j
</groupId>
+ <artifactId>
slf4j-simple
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>
org.mockit
o</groupId>
- <artifactId>
mockito-all
</artifactId>
+ <groupId>
commons-i
o</groupId>
+ <artifactId>
commons-io
</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
-
<dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<scope>test</scope>
</dependency>
<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>
@@
-81,15
+73,12
@@
<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>
-
<plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@
-100,34
+89,20
@@
</executions>
</plugin>
<plugin>
</executions>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org.opendaylight.controller.*</include>
- </includes>
- <check>false</check>
- </configuration>
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<executions>
<execution>
- <id>pre-test</id>
<goals>
<goals>
- <goal>
prepare-agent
</goal>
+ <goal>
test-jar-no-fork
</goal>
</goals>
</execution>
</goals>
</execution>
- <execution>
- <id>post-test</id>
- <goals>
- <goal>report</goal>
- </goals>
- <phase>test</phase>
- </execution>
</executions>
</plugin>
</plugins>
</build>
</executions>
</plugin>
</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>
<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>