This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new 0012816 PHOENIX-5428 Upgrade maven-checkstyle-plugin version 0012816 is described below commit 00128168a32283a3de832f42478c4433c89d8daf Author: Istvan Toth <st...@stoty.hu> AuthorDate: Tue Aug 6 15:19:48 2019 +0200 PHOENIX-5428 Upgrade maven-checkstyle-plugin version This upgrades maven-checkstyle-plugin to 3.1.0 and updates the checker.xml config files to work with recent checkstyle versions Closes #565 Signed-off-by: Josh Elser <els...@apache.org> --- .../src/main/config/checkstyle/checker.xml | 39 +++++++++------------- pom.xml | 2 +- src/main/config/checkstyle/checker.xml | 39 +++++++++------------- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100755 --- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml +++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. <module name="FileTabCharacter"/> <module name="TreeWalker"> - <property name="cacheFile" value="target/checkstyle-cachefile"/> <!-- Checks for blocks. You know, those {}'s --> <!-- See http://checkstyle.sf.net/config_blocks.html --> @@ -90,10 +89,6 @@ limitations under the License. </module> <!-- Switch statements should be complete and with independent cases --> <module name="FallThrough"/> - <!-- For hadoop_yarn profile, some YARN exceptions aren't loading in checkstyle --> - <module name="RedundantThrows"> - <property name="suppressLoadErrors" value="true" /> - </module> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> <!-- Only one statement per line allowed --> @@ -256,26 +251,24 @@ limitations under the License. <!-- No extra whitespace around types --> <module name="GenericWhitespace"/> - <!-- Required for SuppressionCommentFilter below --> - <module name="FileContentsHolder"/> - </module> + <!-- Setup special comments to suppress specific checks from source files --> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/> + <property name="onCommentFormat" value="CHECKSTYLE\: resume ([\w\|]+)"/> + <property name="checkFormat" value="$1"/> + </module> - <!-- Setup special comments to suppress specific checks from source files --> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/> - <property name="onCommentFormat" value="CHECKSTYLE\: resume ([\w\|]+)"/> - <property name="checkFormat" value="$1"/> - </module> + <!-- Turn off all checks between OFF and ON --> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/> + <property name="onCommentFormat" value="CHECKSTYLE\: ON"/> + </module> - <!-- Turn off all checks between OFF and ON --> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/> - <property name="onCommentFormat" value="CHECKSTYLE\: ON"/> + <!-- Turn off checks for the next N lines. --> + <module name="SuppressWithNearbyCommentFilter"> + <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/> + <property name="influenceFormat" value="$1"/> + </module> </module> - <!-- Turn off checks for the next N lines. --> - <module name="SuppressWithNearbyCommentFilter"> - <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/> - <property name="influenceFormat" value="$1"/> - </module> </module> diff --git a/pom.xml b/pom.xml index 014ec8e..ff14eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -389,7 +389,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.13</version> + <version>3.1.0</version> <executions> <execution> <id>validate</id> diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100644 --- a/src/main/config/checkstyle/checker.xml +++ b/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. <module name="FileTabCharacter"/> <module name="TreeWalker"> - <property name="cacheFile" value="target/checkstyle-cachefile"/> <!-- Checks for blocks. You know, those {}'s --> <!-- See http://checkstyle.sf.net/config_blocks.html --> @@ -90,10 +89,6 @@ limitations under the License. </module> <!-- Switch statements should be complete and with independent cases --> <module name="FallThrough"/> - <!-- For hadoop_yarn profile, some YARN exceptions aren't loading in checkstyle --> - <module name="RedundantThrows"> - <property name="suppressLoadErrors" value="true" /> - </module> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> <!-- Only one statement per line allowed --> @@ -256,26 +251,24 @@ limitations under the License. <!-- No extra whitespace around types --> <module name="GenericWhitespace"/> - <!-- Required for SuppressionCommentFilter below --> - <module name="FileContentsHolder"/> - </module> + <!-- Setup special comments to suppress specific checks from source files --> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/> + <property name="onCommentFormat" value="CHECKSTYLE\: resume ([\w\|]+)"/> + <property name="checkFormat" value="$1"/> + </module> - <!-- Setup special comments to suppress specific checks from source files --> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/> - <property name="onCommentFormat" value="CHECKSTYLE\: resume ([\w\|]+)"/> - <property name="checkFormat" value="$1"/> - </module> + <!-- Turn off all checks between OFF and ON --> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/> + <property name="onCommentFormat" value="CHECKSTYLE\: ON"/> + </module> - <!-- Turn off all checks between OFF and ON --> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/> - <property name="onCommentFormat" value="CHECKSTYLE\: ON"/> + <!-- Turn off checks for the next N lines. --> + <module name="SuppressWithNearbyCommentFilter"> + <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/> + <property name="influenceFormat" value="$1"/> + </module> </module> - <!-- Turn off checks for the next N lines. --> - <module name="SuppressWithNearbyCommentFilter"> - <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/> - <property name="influenceFormat" value="$1"/> - </module> </module>