This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 2bc67df HBASE-23700 Upgrade checkstyle and plugin versions (#1056)
(#1063)
2bc67df is described below
commit 2bc67dfda04a8da90fdd5566ceabb67673f27e99
Author: Nick Dimiduk <[email protected]>
AuthorDate: Fri Jan 17 17:09:16 2020 -0800
HBASE-23700 Upgrade checkstyle and plugin versions (#1056) (#1063)
Bump checkstyle version to 8.28, maven-checkstyle-plugin to 3.1.0.
As per HBASE-23242 and the updated checkstyle docs[1], the LineLength
check should be placed under an instance of Checker.
[1] https://checkstyle.sourceforge.io/config_sizes.html#LineLength
Co-authored-by: Bharath Vissapragada <[email protected]>
Signed-off-by: Jan Hentschel <[email protected]>
Signed-off-by: Viraj Jasani <[email protected]>
---
hbase-checkstyle/src/main/resources/hbase/checkstyle.xml | 13 +++++++------
pom.xml | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index fd5ced8..dc5da82 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -122,12 +122,6 @@
<property name="lineWrappingIndentation" value="2"/>
</module>
- <!-- Size Violation Checks
- http://checkstyle.sourceforge.net/config_sizes.html -->
- <module name="LineLength">
- <property name="max" value="100"/>
- <property name="ignorePattern" value="^package.*|^import.*|a
href|href|http://|https://|ftp://|org.apache.thrift.|com.google.protobuf.|hbase.protobuf.generated"/>
- </module>
<module name="MethodLength"/>
<!-- Whitespace Checks
@@ -138,4 +132,11 @@
<!-- Make the @SuppressWarnings annotations available to Checkstyle -->
<module name="SuppressWarningsHolder"/>
</module>
+
+ <!-- Size Violation Checks
+ http://checkstyle.sourceforge.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="100"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a
href|href|http://|https://|ftp://|org.apache.thrift.|com.google.protobuf.|hbase.protobuf.generated"/>
+ </module>
</module>
diff --git a/pom.xml b/pom.xml
index c8dd5fa..7c4ba63 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1349,7 +1349,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.11</checkstyle.version>
+ <checkstyle.version>8.28</checkstyle.version>
<exec.maven.version>1.6.0</exec.maven.version>
<error-prone.version>2.3.3</error-prone.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations>
@@ -1358,7 +1358,7 @@
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.bundle.version>3.3.0</maven.bundle.version>
- <maven.checkstyle.version>3.0.0</maven.checkstyle.version>
+ <maven.checkstyle.version>3.1.0</maven.checkstyle.version>
<maven.eclipse.version>2.10</maven.eclipse.version>
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version>
