You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2020/02/10 10:16:47 UTC

[ranger] branch master updated: RANGER-2725: Improve the Checkstyle integration from RANGER-2588

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 65b4cec  RANGER-2725: Improve the Checkstyle integration from RANGER-2588
65b4cec is described below

commit 65b4cec2b68e2e1aa260bfe115d77a60c6d41f20
Author: Lars Francke <la...@gmail.com>
AuthorDate: Mon Feb 10 15:41:29 2020 +0530

    RANGER-2725: Improve the Checkstyle integration from RANGER-2588
    
    Signed-off-by: Pradeep <pr...@apache.org>
---
 dev-support/checkstyle-java-header.txt  |  18 --
 dev-support/checkstyle-suppressions.xml |   8 +-
 dev-support/checkstyle.xml              | 362 ++++++++++++--------------------
 pom.xml                                 |   5 +-
 4 files changed, 139 insertions(+), 254 deletions(-)

diff --git a/dev-support/checkstyle-java-header.txt b/dev-support/checkstyle-java-header.txt
deleted file mode 100644
index eaa97d7..0000000
--- a/dev-support/checkstyle-java-header.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
\ No newline at end of file
diff --git a/dev-support/checkstyle-suppressions.xml b/dev-support/checkstyle-suppressions.xml
index 0415e48..8fa9081 100644
--- a/dev-support/checkstyle-suppressions.xml
+++ b/dev-support/checkstyle-suppressions.xml
@@ -16,10 +16,10 @@
    limitations under the License.
 -->
 <!DOCTYPE suppressions PUBLIC
-"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+  "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
+  "https://checkstyle.org/dtds/suppressions_1_0.dtd">
 
 <suppressions>
-    <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
-    <suppress files="[\\/]surefire-reports[\\/]" checks="[a-zA-Z0-9]*"/>
+  <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
+  <suppress files="[\\/]surefire-reports[\\/]" checks="[a-zA-Z0-9]*"/>
 </suppressions>
diff --git a/dev-support/checkstyle.xml b/dev-support/checkstyle.xml
index 4d7f134..2de82b1 100644
--- a/dev-support/checkstyle.xml
+++ b/dev-support/checkstyle.xml
@@ -1,243 +1,147 @@
 <?xml version="1.0"?>
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You 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.
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
-  Checkstyle configuration for Beacon that is based on the sun_checks.xml file
-  that is bundled with Checkstyle and includes checks for:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
+  "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+  "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
+ <!-- https://checkstyle.org/config_whitespace.html#FileTabCharacter -->
+ <!--<module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>  -->
 
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <!-- module name="PackageHtml"/ -->
 
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!-- <module name="NewlineAtEndOfFile"/> -->
+  <!--<module name="NewlineAtEndOfFile"/> --><!-- https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
 
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <!-- <module name="Header">
-        <property name="headerFile" value="${checkstyle.header.file}"/>
-        <property name="fileExtensions" value="java"/>
-    </module> -->
-
-	<module name="FileLength">
-        <property name="max" value="6000"/>
+<!-- https://checkstyle.org/config_annotation.html#AnnotationLocation -->
+<!--   <module name="TreeWalker">
+    <module name="AnnotationLocation"> 
+      <property name="id" value="AnnotationLocationMostCases"/>
+      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
     </module>
-    <!-- <module name="FileTabCharacter"/> -->
-
-    <module name="TreeWalker">
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <!-- <module name="JavadocType">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-        </module> -->
-        <!-- <module name="JavadocStyle"/> -->
-
-        <!-- <module name="SuperClone"/> -->
-        <!-- <module name="SuperFinalize"/> -->
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <!-- <module name="ConstantName"/> -->
-        <!-- <module name="ClassTypeParameterName">
-            <property name="format" value="^[A-Z]+$"/>
-        </module> -->
-        <!-- <module name="LocalFinalVariableName"> -->
-            <!--<property name="format" value="^[A-Z][_A-Z0-9]*$"/>-->
-        <!--</module>-->
-        <!-- <module name="LocalVariableName"/> -->
-        <!-- <module name="MemberName"/> -->
-        <!-- <module name="MethodName"/> -->
-        <!-- <module name="MethodTypeParameterName">
-            <property name="format" value="^[A-Z]+$"/>
-        </module> -->
-        <!-- <module name="PackageName"/> -->
-        <!-- <module name="ParameterName"/> -->
-        <!-- <module name="StaticVariableName"/> -->
-        <!-- <module name="TypeName"/> -->
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <!-- <module name="IllegalImport"/> -->
-        <!-- defaults to sun.* packages -->
-        <!-- <module name="RedundantImport"/> -->
-        <!-- <module name="UnusedImports"/> -->
-        <!-- <module name="AvoidStarImport">
-            <property name="allowClassImports" value="false"/>
-        </module> -->
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <!-- <module name="LineLength">
-            <property name="max" value="120"/>
-        </module> -->
-        <!-- <module name="MethodLength">
-            <property name="max" value="200"/>
-        </module> -->
-        <!-- <module name="ParameterNumber">
-            <property name="max" value="8"/>
-        </module> -->
-        <!-- <module name="OuterTypeNumber"/> -->
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <!-- <module name="GenericWhitespace"/> -->
-        <!-- <module name="EmptyForIteratorPad"/> -->
-        <!-- <module name="MethodParamPad"/> -->
-        <!-- <module name="WhitespaceAround">
-            <property name="tokens" value="LITERAL_IF"/>
-        </module> -->
-        <!-- <module name="NoWhitespaceAfter">
-            <property name="tokens"
-                      value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
-        </module> -->
-        <!-- <module name="NoWhitespaceBefore"/> -->
-        <!-- <module name="OperatorWrap"/> -->
-        <!-- <module name="ParenPad"/> -->
-        <!-- <module name="TypecastParenPad"/> -->
-        <!-- <module name="WhitespaceAfter"> 
-            <property name="tokens" value="COMMA, SEMI"/>
-        </module> -->
-
-        <!-- <module name="Regexp">
-            <property name="format" value="[ \t]+$"/>
-            <property name="illegalPattern" value="true"/>
-            <property name="message" value="Trailing whitespace"/>
-        </module> -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <!-- <module name="ModifierOrder"/> -->
-        <!-- <module name="RedundantModifier"/> -->
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <!-- <module name="AvoidNestedBlocks"/> -->
-        <!-- catch blocks need a statement or a comment. -->
-        <!-- <module name="EmptyBlock">
-            <property name="option" value="text"/>
-            <property name="tokens" value="LITERAL_CATCH"/>
-        </module> -->
-        <!-- all other blocks need a real statement. -->
-        <!-- <module name="EmptyBlock">
-            <property name="option" value="stmt"/>
-            <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
-          LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT,
-          STATIC_INIT"/>
-        </module> -->
-        <!-- <module name="LeftCurly"/> -->
-        <!-- <module name="NeedBraces"/> -->
-        <!-- <module name="RightCurly"/> -->
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- module name="AvoidInlineConditionals"/-->
-        <!-- DoubleCheckedLocking check is no longer required. See http://checkstyle.sourceforge.net/releasenotes.html -->
-        <!-- module name="DoubleCheckedLocking"/-->
-        <!--<module name="EmptyStatement"/> -->
-        <!--<module name="EqualsHashCode"/> -->
-        <!--<module name="StringLiteralEquality"/> -->
-        <!--<module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreAbstractMethods" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module> -->
-        <!--<module name="IllegalInstantiation"/> -->
-        <!--<module name="InnerAssignment"/> -->
-        <!--<module name="MissingSwitchDefault"/> -->
-        <!--<module name="SimplifyBooleanExpression"/> -->
-        <!--<module name="SimplifyBooleanReturn"/> -->
-        <!--<module name="DefaultComesLast"/> -->
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!--<module name="HideUtilityClassConstructor"/> -->
-        <!--<module name="InterfaceIsType"/> -->
-        <!--<module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-        </module> -->
-        <!--<module name="MissingOverride"/> -->
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <!--<module name="ArrayTypeStyle"/> -->
-        <!--<module name="ArrayTrailingComma"/> -->
-        <!--
-          This generates too many false-positives on wrapped 'throws' clauses
-          to be really useful. Disabled for now.
-
-          Beacon style is:
-          * Spaces, not tabs.
-          * Indent by four spaces.
-          * Indent by four spaces when wrapping a line.
-        -->
-        <!--<module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="8"/>
-        </module> -->
-        <!--<module name="TodoComment"/> -->
-        <!--<module name="UpperEll"/> -->
-
-        <module name="FileContentsHolder"/>
+    <module name="AnnotationLocation">
+      <property name="id" value="AnnotationLocationVariables"/>
+      <property name="tokens" value="VARIABLE_DEF"/>
+      <property name="allowSamelineMultipleAnnotations" value="true"/>
     </module>
-
-    <!-- allow warnings to be suppressed -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="SUSPEND CHECKSTYLE CHECK ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName|LineLengthCheck"/>
-        <property name="onCommentFormat" value="RESUME CHECKSTYLE CHECK ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName|LineLengthCheck"/>
-        <property name="checkFormat" value="ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName|LineLengthCheck"/>
+    -->
+    <!-- https://checkstyle.org/config_misc.html#AvoidEscapedUnicodeCharacters -->
+    <!--<module name="AvoidEscapedUnicodeCharacters"> 
+      <property name="allowEscapesForControlCharacters" value="true"/>
+      <property name="allowByTailComment" value="true"/>
+      <property name="allowNonPrintableEscapes" value="true"/>
     </module>
+    -->
+    <!--<module name="ArrayTypeStyle"/>--> <!-- https://checkstyle.org/config_misc.html#ArrayTypeStyle -->
+    <!--<module name="AvoidNestedBlocks"/>--> <!-- https://checkstyle.org/config_blocks.html#AvoidNestedBlocks -->
+    <!--<module name="AvoidNoArgumentSuperConstructorCall"/>--> <!-- https://checkstyle.org/config_coding.html#AvoidNoArgumentSuperConstructorCall -->
+    <!--<module name="AvoidStarImport"/>--> <!-- https://checkstyle.org/config_imports.html#AvoidStarImport -->
+
+    <!--<module name="CommentsIndentation"/>--> <!-- https://checkstyle.org/config_misc.html#CommentsIndentation -->
+    <!--<module name="ConstantName"/>--> <!-- https://checkstyle.org/config_naming.html#ConstantName -->
+	<!-- https://checkstyle.org/config_blocks.html#EmptyBlock -->
+    <!--<module name="EmptyBlock"> 
+      <property name="option" value="TEXT"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>-->
+    <!-- https://checkstyle.org/config_blocks.html#EmptyCatchBlock -->
+    <!--<module name="EmptyCatchBlock"> 
+      <property name="exceptionVariableName" value="expected|ignore"/>
+    </module>-->
+    <!-- https://checkstyle.org/config_whitespace.html#EmptyLineSeparator -->
+    <!--<module name="EmptyLineSeparator"> 
+    </module>-->
+    <!--<module name="EmptyStatement"/> --> <!-- https://checkstyle.org/config_coding.html#EmptyStatement -->
+    <!--<module name="EqualsHashCode"/> --> <!-- https://checkstyle.org/config_coding.html#EqualsHashCode -->
+
+    <!--<module name="FallThrough"/> --> <!-- https://checkstyle.org/config_coding.html#FallThrough -->
+
+   <!-- https://checkstyle.org/config_whitespace.html#GenericWhitespace -->
+   <!-- <module name="GenericWhitespace"> 
+      <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+      <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+    </module>-->
+
+    <!--<module name="HideUtilityClassConstructor"/>--> <!-- https://checkstyle.org/config_design.html#HideUtilityClassConstructor -->
+
+    <!--<module name="Indentation"/>--> <!-- https://checkstyle.org/config_misc.html#Indentation -->
+    <!--<module name="InnerAssignment"/> --><!-- https://checkstyle.org/config_coding.html#InnerAssignment -->
+    <!--<module name="InvalidJavadocPosition"/>--> <!-- https://checkstyle.org/config_javadoc.html#InvalidJavadocPosition -->
+
+    <!--<module name="JavadocTagContinuationIndentation"/>--> <!-- https://checkstyle.org/config_javadoc.html#JavadocTagContinuationIndentation -->
+
+    <!--<module name="LeftCurly"/>--> <!-- https://checkstyle.org/config_blocks.html#LeftCurly -->
+
+    <!--<module name="MethodParamPad"/>--> <!-- https://checkstyle.org/config_whitespace.html#MethodParamPad -->
+    <!--<module name="MissingDeprecated"/> --><!-- https://checkstyle.org/config_annotation.html#MissingDeprecated -->
+    <!--<module name="MissingOverride"/> --><!-- https://checkstyle.org/config_annotation.html#MissingOverride -->
+    <!--<module name="MissingSwitchDefault"/>--> <!-- https://checkstyle.org/config_coding.html#MissingSwitchDefault -->
+    <!--<module name="ModifierOrder"/>--> <!-- https://checkstyle.org/config_modifier.html#ModifierOrder -->
+    <!--<module name="MultipleVariableDeclarations"/>--> <!-- https://checkstyle.org/config_coding.html#MultipleVariableDeclarations -->
+
+    <!--<module name="NeedBraces"/> --><!-- https://checkstyle.org/config_blocks.html#NeedBraces -->
+    <!--<module name="NoFinalizer"/> --><!-- https://checkstyle.org/config_coding.html#NoFinalizer -->
+    <!--<module name="NoLineWrap"/> --><!-- https://checkstyle.org/config_whitespace.html#NoLineWrap -->
+    <!--<module name="NonEmptyAtclauseDescription"/>--> <!-- https://checkstyle.org/config_javadoc.html#NonEmptyAtclauseDescription -->
+    <!--<module name="NoWhitespaceAfter"/> --><!-- https://checkstyle.org/config_whitespace.html#NoWhitespaceAfter -->
+    <!-- https://checkstyle.org/config_whitespace.html#NoWhitespaceBefore -->
+    <!--<module name="NoWhitespaceBefore"> 
+      <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module> -->
 
+    <!--<module name="OneStatementPerLine">--> <!-- https://checkstyle.org/config_coding.html#OneStatementPerLine -->
+    <!--<module name="OneTopLevelClass">--><!-- https://checkstyle.org/config_design.html#OneTopLevelClass -->
+    <!--<module name="OuterTypeFilename">--> <!-- https://checkstyle.org/config_misc.html#OuterTypeFilename -->
+    <!--<module name="OverloadMethodsDeclarationOrder">--><!-- https://checkstyle.org/config_coding.html#OverloadMethodsDeclarationOrder -->
+
+    <!--<module name="ParenPad"/>--> <!-- https://checkstyle.org/config_whitespace.html#ParenPad -->
+
+    <!--<module name="RedundantImport"/> --><!-- https://checkstyle.org/config_imports.html#RedundantImport -->
+   <!-- <module name="RedundantModifier"/>--> <!-- https://checkstyle.org/config_modifier.html#RedundantModifier -->
+   <!-- https://checkstyle.org/config_blocks.html#RightCurly -->
+    <!--<module name="RightCurly">
+        <property name="id" value="RightCurlySame"/>
+        <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+    </module>--> 
+   <!-- <module name="RightCurly">
+      <property name="id" value="RightCurlyAlone"/>
+      <property name="option" value="alone"/>
+      <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/>
+    </module>--> 
+
+    <!--<module name="SimplifyBooleanExpression"/>--> <!-- https://checkstyle.org/config_coding.html#SimplifyBooleanExpression -->
+    <!--<module name="SimplifyBooleanReturn"/>--> <!-- https://checkstyle.org/config_coding.html#SimplifyBooleanReturn -->
+    <!--<module name="StringLiteralEquality"/> --><!-- https://checkstyle.org/config_coding.html#StringLiteralEquality -->
+
+    <!--<module name="UnusedImports"/>--> <!-- https://checkstyle.org/config_imports.html#UnusedImports -->
+    <!--<module name="UpperEll"/>--> <!-- https://checkstyle.org/config_misc.html#UpperEll -->
+
+     <!--<module name="WhitespaceAfter"/>--> <!-- https://checkstyle.org/config_whitespace.html#WhitespaceAfter -->
+     <!-- https://checkstyle.org/config_whitespace.html#WhitespaceAround -->
+    <!--<module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <property name="allowEmptyLambdas" value="true"/>
+    </module>
+  </module>-->
 </module>
diff --git a/pom.xml b/pom.xml
index 0ffbb19..adb8cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,8 @@
         <bouncycastle.version>1.55</bouncycastle.version>
         <c3p0.version>0.9.5.3</c3p0.version>
         <cglib.version>2.2.0-b23</cglib.version>
+        <checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
+        <checkstyle.version>8.29</checkstyle.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <commons.cli.version>1.2</commons.cli.version>
@@ -212,8 +214,6 @@
         <net.minidev.asm.version>1.0.2</net.minidev.asm.version>
         <org.bouncycastle.bcprov-jdk15on>1.59</org.bouncycastle.bcprov-jdk15on>
         <org.bouncycastle.bcpkix-jdk15on>1.59</org.bouncycastle.bcpkix-jdk15on>
-        <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
-        <checkstyle.version>6.11.2</checkstyle.version>
     </properties>
     <profiles>
         <profile>
@@ -1041,7 +1041,6 @@
                             <consoleOutput>true</consoleOutput>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>
                             <configLocation>./dev-support/checkstyle.xml</configLocation>
-                            <headerLocation>./dev-support/checkstyle-java-header.txt</headerLocation>
                             <suppressionsLocation>./dev-support/checkstyle-suppressions.xml</suppressionsLocation>
                             <failOnViolation>true</failOnViolation>
                         </configuration>