From 36114e11683a87fb6759392b1d38aa5049117974 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Wed, 25 Apr 2018 11:34:37 -0500 Subject: [PATCH] HBASE-20478 move hbaseanti import checks to checkstyle --- dev-support/hbase-personality.sh | 18 ------------------ .../src/main/resources/hbase/checkstyle.xml | 7 ++++++- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b010503553..45b660497b 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -630,24 +630,6 @@ 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 index c77d46b93f..5b6f41fd1a 100644 --- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml +++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml @@ -85,7 +85,12 @@ org.apache.commons.collections4, org.apache.commons.lang, org.apache.curator.shaded, - org.apache.htrace.shaded"/> + org.apache.hadoop.classification, + org.apache.htrace.shaded, + org.codehaus.jackson"/> + -- 2.16.1