diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b0336458d0a..2b1e2c34f9e 100755 --- 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 index 5b6f41fd1a2..c77d46b93fc 100644 --- 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"/> - + org.apache.htrace.shaded"/>