From d4babbf060a99222c7ebe60ee1b0f4197411ea37 Mon Sep 17 00:00:00 2001
From: zhangduo <zhangduo@apache.org>
Date: Wed, 15 Nov 2017 15:38:02 +0800
Subject: [PATCH] HBASE-19262 Revisit checkstyle rules

---
 .../src/main/resources/hbase/checkstyle-suppressions.xml       | 3 ++-
 hbase-checkstyle/src/main/resources/hbase/checkstyle.xml       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
index 46009e9e5d4..1ecae86f4ed 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml
@@ -33,5 +33,6 @@
 <suppressions>
   <suppress checks="." files=".*/generated/.*\.java"/>
   <suppress checks="." files=".*/generated-jamon/.*\.java"/>
-  <suppress checks="MagicNumberCheck" files=".*Test\.java"/>
+  <suppress checks="MagicNumberCheck" files=".*/src/test/.*\.java"/>
+  <suppress checks="VisibilityModifier" files=".*/src/test/.*\.java"/>
 </suppressions>
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index b42309574b2..2240096e40d 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -67,6 +67,7 @@
     http://checkstyle.sourceforge.net/config_imports.html -->
     <module name="AvoidStarImport"/>
     <module name="ImportOrder">
+      <property name="groups" value="*,org.apache.hadoop.hbase.shaded"/>
       <property name="option" value="top" />
       <property name="ordered" value="true"/>
       <property name="sortStaticImportsAlphabetically" value="true"/>