summaryrefslogtreecommitdiffstats
path: root/common/checkstyle
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/checkstyle
parent9a9c793a0bc09bfc4b232e0626e94ca8b9906843 (diff)
HONEYCOMB-274 Fix checkstyle license checks
Change-Id: I9a7783bf072b2e2396f0fa1a784bcb57adb689b4 Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'common/checkstyle')
-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
3 files changed, 33 insertions, 2 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 -->