Revert "HBASE-20478 move hbaseanti import checks to checkstyle"

Need to update version of checkstyle used for new features. This reverts commit 90d103d.
shadow-tx · Apr 26, 2018 · e6220c8 · e6220c8
1 parent 90d103d
commit e6220c8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
@@ -631,6 +631,24 @@ function hbaseanti_patchfile
     ((result=result+1))
   fi
 
+  warnings=$(${GREP} -c 'import org.apache.hadoop.classification' "${patchfile}")
+  if [[ ${warnings} -gt 0 ]]; then
+    add_vote_table -1 hbaseanti "" "The patch appears use Hadoop classification instead of HBase."
+    ((result=result+1))
+  fi
+
+  warnings=$(${GREP} -c 'import org.codehaus.jackson' "${patchfile}")
+  if [[ ${warnings} -gt 0 ]]; then
+    add_vote_table -1 hbaseanti "" "The patch appears use Jackson 1 classes/annotations."
+    ((result=result+1))
+  fi
+
+  warnings=$(${GREP} -cE 'org.apache.commons.logging.Log(Factory|;)' "${patchfile}")
+  if [[ ${warnings} -gt 0 ]]; then
+    add_vote_table -1 hbaseanti "" "The patch appears to use commons-logging instead of slf4j."
+    ((result=result+1))
+  fi
+
   if [[ ${result} -gt 0 ]]; then
     return 1
   fi

diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -85,12 +85,7 @@
           org.apache.commons.collections4,
           org.apache.commons.lang,
           org.apache.curator.shaded,
-          org.apache.hadoop.classification,
-          org.apache.htrace.shaded,
-          org.codehaus.jackson"/>
-      <property name="illegalClasses" value="
-          org.apache.commons.logging.Log,
-          org.apache.commons.logging.LogFactory"/>
+          org.apache.htrace.shaded"/>
     </module>
     <!-- Javadoc Checks
     http://checkstyle.sourceforge.net/config_javadoc.html -->