You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2018/07/02 16:28:58 UTC

hadoop git commit: HADOOP-15252. Checkstyle version is not compatible with IDEA's checkstyle plugin

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 d34260f12 -> a41dc6ef5


HADOOP-15252. Checkstyle version is not compatible with IDEA's checkstyle plugin

Signed-off-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit 90d2bdcb752f5f32ef65765af6fd5596dd5d373b)


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

Branch: refs/heads/branch-3.0
Commit: a41dc6ef5b2e9244a389200169c5c678f770debd
Parents: d34260f
Author: Andras Bokor <bo...@freemail.hu>
Authored: Fri Mar 2 17:08:17 2018 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Mon Jul 2 18:28:46 2018 +0200

----------------------------------------------------------------------
 hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml | 5 ++---
 pom.xml                                                         | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a41dc6ef/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
----------------------------------------------------------------------
diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
index 2053561..f4e4f42 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -50,8 +50,6 @@
 <module name="Checker">
 
     <module name="SuppressWarningsFilter"/>
-    <module name="SuppressionCommentFilter"/>
-    <module name="SuppressWithNearbyCommentFilter"/>
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
@@ -72,7 +70,8 @@
     <module name="TreeWalker">
 
         <module name="SuppressWarningsHolder"/>
-        <module name="FileContentsHolder"/>
+        <module name="SuppressionCommentFilter"/>
+        <module name="SuppressWithNearbyCommentFilter"/>
 
 
         <!-- Checks for Javadoc comments.                     -->

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a41dc6ef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 479f914..122432c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,8 +107,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <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>2.17</maven-checkstyle-plugin.version>
-    <checkstyle.version>7.5.1</checkstyle.version>
+    <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+    <checkstyle.version>8.8</checkstyle.version>
     <dependency-check-maven.version>1.4.3</dependency-check-maven.version>
 
     <shell-executable>bash</shell-executable>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org