From f777cd398f1d48898ddc4a9a5ab4e7e310e3027a Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 20 Dec 2019 13:10:04 +0900
Subject: [PATCH] HADOOP-16771. Update checkstyle to 8.26 and
 maven-checkstyle-plugin to 3.1.0. Contributed by Andras Bokor.

---
 .../src/main/resources/checkstyle/checkstyle.xml          | 5 ++++-
 hadoop-tools/hadoop-azure/src/config/checkstyle.xml       | 8 ++++----
 pom.xml                                                   | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
index 32f83e7a588..8f3d3f13824 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -67,6 +67,10 @@
     <!--<module name="FileLength">-->
     <module name="FileTabCharacter"/>
 
+    <!-- Checks for line length violations.                                 -->
+    <!-- See https://checkstyle.sourceforge.io/config_sizes.html#LineLength -->
+    <module name="LineLength"/>
+
     <module name="TreeWalker">
 
         <module name="SuppressWarningsHolder"/>
@@ -122,7 +126,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength"/>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
           <property name="ignoreOverriddenMethods" value="true"/>
diff --git a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
index 969f4a51bf9..627bb65a28b 100644
--- a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
+++ b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
@@ -62,6 +62,10 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="LineLength">
+        <property name="max" value="160" />
+    </module>
+
     <module name="TreeWalker">
 
         <!-- Checks for Javadoc comments.                     -->
@@ -101,10 +105,6 @@
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
 
-        <module name="LineLength">
-          <property name="max" value="160" />
-        </module>
-        
         <module name="MethodLength">
           <property name="max" value="3000"/>
         </module>
diff --git a/pom.xml b/pom.xml
index 812c73e543c..779ca79ae2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,8 +110,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
     <maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
     <maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
     <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-    <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
-    <checkstyle.version>8.19</checkstyle.version>
+    <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+    <checkstyle.version>8.26</checkstyle.version>
     <dependency-check-maven.version>1.4.3</dependency-check-maven.version>
 
     <shell-executable>bash</shell-executable>