You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2020/08/04 14:05:45 UTC

[tez] branch branch-0.9 updated: TEZ-4212. Fix build checkstyle configuration and suppressions dtd URLs (Jonathan Eagles reviewed by László Bodor)

This is an automated email from the ASF dual-hosted git repository.

jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new d6c4581  TEZ-4212. Fix build checkstyle configuration and suppressions dtd URLs (Jonathan Eagles reviewed by László Bodor)
d6c4581 is described below

commit d6c4581bd22f16c09ab894f4575875c272d3c830
Author: Jonathan Eagles <je...@apache.org>
AuthorDate: Tue Aug 4 08:58:22 2020 -0500

    TEZ-4212. Fix build checkstyle configuration and suppressions dtd URLs (Jonathan Eagles reviewed by László Bodor)
    
    Signed-off-by: Jonathan Eagles <je...@apache.org>
    (cherry picked from commit 5f3cac509df0acb733c9f3539a6a37dd0dda1297)
---
 pom.xml                                                       |  4 ++--
 tez-build-tools/src/main/resources/checkstyle/checkstyle.xml  | 11 ++++++-----
 .../src/main/resources/checkstyle/suppressions.xml            |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 471a155..d3f0c71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,8 +59,8 @@
     <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
     <javadoc-maven-plugin.version>2.10.4</javadoc-maven-plugin.version>
     <shade-maven-plugin.version>2.4.3</shade-maven-plugin.version>
-    <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
-    <checkstyle.version>8.16</checkstyle.version>
+    <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+    <checkstyle.version>8.35</checkstyle.version>
     <dependency-check-maven.version>1.3.6</dependency-check-maven.version>
     <test.build.data>${project.build.directory}/tmp</test.build.data>
   </properties>
diff --git a/tez-build-tools/src/main/resources/checkstyle/checkstyle.xml b/tez-build-tools/src/main/resources/checkstyle/checkstyle.xml
index fd002de..cac5814 100644
--- a/tez-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/tez-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -67,6 +67,10 @@
     <!--<module name="FileLength">-->
     <module name="FileTabCharacter"/>
 
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+
     <module name="TreeWalker">
 
         <module name="SuppressWarningsHolder"/>
@@ -122,9 +126,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-          <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
           <property name="ignoreOverriddenMethods" value="true"/>
diff --git a/tez-build-tools/src/main/resources/checkstyle/suppressions.xml b/tez-build-tools/src/main/resources/checkstyle/suppressions.xml
index ccc89c8..829751a 100644
--- a/tez-build-tools/src/main/resources/checkstyle/suppressions.xml
+++ b/tez-build-tools/src/main/resources/checkstyle/suppressions.xml
@@ -13,8 +13,8 @@
   limitations under the License. See accompanying LICENSE file.
 -->
 <!DOCTYPE suppressions PUBLIC
-"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
   <suppress checks="JavadocPackage" files="[\\/]src[\\/]test[\\/].*"/>