summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-10-27 14:55:07 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-10-28 11:06:55 +0000
commit2b6c5f5dd1530499f3657c8e86fb9c0246c80d73 (patch)
treeb9079e105ec83ee4f28053f071ebec513436c194 /common
parent9a9c793a0bc09bfc4b232e0626e94ca8b9906843 (diff)
HONEYCOMB-274 Fix checkstyle license checks
Change-Id: I9a7783bf072b2e2396f0fa1a784bcb57adb689b4 Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'common')
-rw-r--r--common/checkstyle/src/main/resources/honeycomb-checkstyle-license.xml32
-rw-r--r--common/checkstyle/src/main/resources/honeycomb-checkstyle-logging.xml2
-rw-r--r--common/checkstyle/src/main/resources/honeycomb-checkstyle.xml1
-rw-r--r--common/honeycomb-parent/pom.xml24
4 files changed, 44 insertions, 15 deletions
diff --git a/common/checkstyle/src/main/resources/honeycomb-checkstyle-license.xml b/common/checkstyle/src/main/resources/honeycomb-checkstyle-license.xml
new file mode 100644
index 0000000..d0c32e2
--- /dev/null
+++ b/common/checkstyle/src/main/resources/honeycomb-checkstyle-license.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+ ~ Copyright (c) 2016 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+ Checkstyle configuration for Honeycomb, checking the license
+ -->
+
+<module name="Checker">
+ <property name="charset" value="UTF-8"/>
+ <property name="severity" value="error"/>
+ <module name="RegexpHeader">
+ <property name="headerFile" value="/HONEYCOMB_LICENSE.txt"/>
+ </module>
+</module> \ No newline at end of file
diff --git a/common/checkstyle/src/main/resources/honeycomb-checkstyle-logging.xml b/common/checkstyle/src/main/resources/honeycomb-checkstyle-logging.xml
index 79bdbfd..2f5296e 100644
--- a/common/checkstyle/src/main/resources/honeycomb-checkstyle-logging.xml
+++ b/common/checkstyle/src/main/resources/honeycomb-checkstyle-logging.xml
@@ -9,7 +9,7 @@
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
-
+ <property name="charset" value="UTF-8"/>
<property name="severity" value="error"/>
<module name="RegexpMultiline">
diff --git a/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml b/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml
index ae631c9..e3a2207 100644
--- a/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml
+++ b/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml
@@ -9,7 +9,6 @@
<module name = "Checker">
<property name="charset" value="UTF-8"/>
-
<property name="severity" value="warning"/>
<!-- Checks for whitespace -->
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
index dce5407..d050a91 100644
--- a/common/honeycomb-parent/pom.xml
+++ b/common/honeycomb-parent/pom.xml
@@ -59,7 +59,7 @@
<!-- plugins -->
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
- <checkstyle.version>6.16</checkstyle.version>
+ <checkstyle.version>7.1.2</checkstyle.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<jacoco.version>0.7.2.201409121644</jacoco.version>
<enforcer.version>1.4</enforcer.version>
@@ -205,11 +205,12 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
- <!-- Override checkstyle configuration to fit Honeycomb coding style-->
- <configLocation>honeycomb-checkstyle.xml</configLocation>
- <includeTestResources>true</includeTestResources>
<!--TODO HONEYCOMB-155 enable fail on violation after issues are resolved + set in as errors in checkstyle xml-->
-
+ <failOnViolation>false</failOnViolation>
+ <failsOnError>true</failsOnError>
+ <consoleOutput>true</consoleOutput>
+ <includeTestResources>true</includeTestResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
<includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
<excludes>**\/target\/,
**\/bin\/,
@@ -222,7 +223,6 @@
**\/archetype-resources\/</excludes>
</configuration>
<executions>
-
<!-- Override license check configuration to fit Honeycomb coding style-->
<execution>
<id>check-license</id>
@@ -231,13 +231,10 @@
</goals>
<phase>process-sources</phase>
<configuration>
- <headerLocation>HONEYCOMB_LICENSE.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- <failsOnError>true</failsOnError>
+ <configLocation>honeycomb-checkstyle-license.xml</configLocation>
<outputFile>${project.build.directory}/checkstyle-license-result.xml</outputFile>
</configuration>
</execution>
-
<!-- Add logging checks from yangtools -->
<execution>
<id>check-logging</id>
@@ -246,19 +243,20 @@
</goals>
<phase>process-sources</phase>
<configuration>
- <failOnViolation>true</failOnViolation>
<configLocation>honeycomb-checkstyle-logging.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
<outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile>
</configuration>
</execution>
+ <!-- Check HC's coding style -->
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>process-sources</phase>
+ <configuration>
+ <configLocation>honeycomb-checkstyle.xml</configLocation>
+ </configuration>
</execution>
</executions>
<dependencies>