Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix checkstyle violations in sal-dom-broker-config and sal-binding-config
[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 084ef16f575ce67c8725031e2742a86f1f7105d5..67c99e3d3e833af4e84101f2ec605b65cc2fea00 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/
opendaylight/md-sal/sal-akka-raft/pom.xml
@@
-3,46
+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.8.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.8.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- </dependency>
- <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>
@@
-61,30
+61,33
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
com.typesafe.akka
</groupId>
- <artifactId>
akka-slf4j_${scala.version}
</artifactId>
+ <groupId>
org.apache.commons
</groupId>
+ <artifactId>
commons-lang3
</artifactId>
</dependency>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_2.12</artifactId>
</dependency>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-97,9
+100,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>
@@
-117,49
+119,27
@@
</plugin>
<plugin>
</plugin>
<plugin>
- <groupId>org.
jacoco
</groupId>
- <artifactId>
jacoco-maven
-plugin</artifactId>
+ <groupId>org.
apache.maven.plugins
</groupId>
+ <artifactId>
maven-checkstyle
-plugin</artifactId>
<configuration>
<configuration>
- <includes>
- <include>org/opendaylight/controller/cluster/**/*</include>
- </includes>
- <excludes>
- <exclude>org/opendaylight/controller/cluster/raft/protobuff/**/*</exclude>
- <exclude>org/opendaylight/controller/cluster/example/**/*</exclude>
- </excludes>
- <check>false</check>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
</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>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<configuration>
-
<excludes>**/protobuff/**/*</excludes
>
+
<failOnError>true</failOnError
>
</configuration>
</plugin>
</configuration>
</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>