Repository: hadoop Updated Branches: refs/heads/branch-2 214b6d16d -> 1a2c77150
HADOOP-13411. Checkstyle suppression by annotation or comment. Contributed by John Zhuge. (cherry picked from commit 0e68e14d5506288bbda02cfc755babf1e9875187) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a2c7715 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a2c7715 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a2c7715 Branch: refs/heads/branch-2 Commit: 1a2c77150177fbf2d3e053fb25c09f37a8e54920 Parents: 214b6d1 Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Fri Sep 16 14:16:25 2016 -0700 Committer: Wei-Chiu Chuang <weic...@apache.org> Committed: Fri Sep 16 14:17:20 2016 -0700 ---------------------------------------------------------------------- .../src/main/resources/checkstyle/checkstyle.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a2c7715/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 3aaf176..033529f 100644 --- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml +++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml @@ -49,6 +49,10 @@ <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 --> <module name="JavadocPackage"/> @@ -67,6 +71,10 @@ <module name="TreeWalker"> + <module name="SuppressWarningsHolder"/> + <module name="FileContentsHolder"/> + + <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> <module name="JavadocType"> @@ -180,7 +188,7 @@ <module name="Indentation"> <property name="basicOffset" value="2" /> <property name="caseIndent" value="0" /> - </module> + </module> <!--<module name="TodoComment"/>--> <module name="UpperEll"/> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org