Use buck version of checkstyle rules in maven build
- build and package the checkstyle rules in the onos-build-conf artifact
- modify maven build to use new version of artifact
- fix checkstyle problems in maven-only code
Change-Id: I4e4dc890ca909e47463629c732a2fc5335bb4d2a
diff --git a/lib/pom.xml b/lib/pom.xml
index 305c043..32f5791 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -36,7 +36,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos-build-conf.version>1.3</onos-build-conf.version>
+ <onos-build-conf.version>1.10.0-SNAPSHOT</onos-build-conf.version>
<netty4.version>4.1.5.Final</netty4.version>
<openflowj.version>0.9.7.onos</openflowj.version>
<onos-maven-plugin.version>1.10</onos-maven-plugin.version>
@@ -586,6 +586,11 @@
<artifactId>onos-build-conf</artifactId>
<version>${onos-build-conf.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
</dependencies>
<configuration>
<!-- begin: workaround for unexpected NullPointerException on Eclipse -->
@@ -594,9 +599,11 @@
<testSourceDirectory>${project.build.testSourceDirectory}
</testSourceDirectory>
<!-- end: workaround for unexpected NullPointerException on Eclipse -->
- <configLocation>onos/checkstyle.xml</configLocation>
+ <configLocation>onos/checkstyle-mvn.xml</configLocation>
<suppressionsLocation>onos/suppressions.xml
</suppressionsLocation>
+ <headerLocation>onos/onos-java.header
+ </headerLocation>
<failsOnError>false</failsOnError>
<logViolationsToConsole>true</logViolationsToConsole>
<includeTestSourceDirectory>true