You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2018/08/02 19:27:28 UTC

[2/3] hbase git commit: HBASE-20749 Update to checkstyle 8.11

HBASE-20749 Update to checkstyle 8.11


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dff5ba27
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dff5ba27
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dff5ba27

Branch: refs/heads/branch-2.1
Commit: dff5ba27c344fdd3e8fe9f30312ed2323162b5ea
Parents: 2e1c12c
Author: Mike Drob <md...@apache.org>
Authored: Fri Jul 6 09:43:00 2018 -0500
Committer: Mike Drob <md...@apache.org>
Committed: Thu Aug 2 14:19:30 2018 -0500

----------------------------------------------------------------------
 .../src/main/resources/hbase/checkstyle-suppressions.xml    | 9 ++++-----
 pom.xml                                                     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/dff5ba27/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
index 2673b8b..33b4f68 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <!--
   TODO Update to use the message suppression filter once we can update
   to checkstyle 8.6+
@@ -46,8 +46,7 @@
   <suppress checks="MethodLength" files="Branch1CoprocessorMethods.java"/>
   <suppress checks="EmptyBlockCheck" files="TBoundedThreadPoolServer.java"/>
   <suppress checks="EqualsHashCode" files="StartcodeAgnosticServerName.java"/>
-<!--
-  TODO use message filter once we can upgrade to checkstyle 8.6+
+  <suppress checks="MethodLength" files="Branch1CoprocessorMethods.java"/>
   <suppress checks="IllegalImport" message="org\.apache\.htrace\.core"/>
--->
+  <suppress checks="ImportOrder" message="Extra separation in import group before"/>
 </suppressions>

http://git-wip-us.apache.org/repos/asf/hbase/blob/dff5ba27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e42f572..de977e1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1390,7 +1390,7 @@
     <asciidoctorj.pdf.version>1.5.0-alpha.15</asciidoctorj.pdf.version>
     <build.helper.maven.version>3.0.0</build.helper.maven.version>
     <buildnumber.maven.version>1.4</buildnumber.maven.version>
-    <checkstyle.version>8.2</checkstyle.version>
+    <checkstyle.version>8.11</checkstyle.version>
     <exec.maven.version>1.6.0</exec.maven.version>
     <error-prone.version>2.2.0</error-prone.version>
     <findbugs-annotations>1.3.9-1</findbugs-annotations>