HBASE-20749 Update to checkstyle 8.12
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c7a2bdd3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c7a2bdd3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c7a2bdd3 Branch: refs/heads/HBASE-20749 Commit: c7a2bdd39f92ce04cde37f9dab4a246af9f2137f Parents: 067388b Author: Mike Drob <[email protected]> Authored: Fri Jul 6 09:43:00 2018 -0500 Committer: Mike Drob <[email protected]> Committed: Fri Jul 20 14:49:58 2018 -0500 ---------------------------------------------------------------------- .../src/main/resources/hbase/checkstyle-suppressions.xml | 8 +++----- pom.xml | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c7a2bdd3/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 1679496..1274426 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,6 @@ <suppress checks="EmptyBlockCheck" files="TBoundedThreadPoolServer.java"/> <suppress checks="EqualsHashCode" files="StartcodeAgnosticServerName.java"/> <suppress checks="MethodLength" files="Branch1CoprocessorMethods.java"/> -<!-- - TODO use message filter once we can upgrade to checkstyle 8.6+ <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/c7a2bdd3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 73bed74..ed3081b 100755 --- a/pom.xml +++ b/pom.xml @@ -1513,7 +1513,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.12</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>
