Repository: hbase Updated Branches: refs/heads/master d4768114e -> 90d103d6d
HBASE-20478 move hbaseanti import checks to checkstyle Signed-off-by: Sean Busbey <bus...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/90d103d6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/90d103d6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/90d103d6 Branch: refs/heads/master Commit: 90d103d6d555871f59ffa0d099dc1f9d3970b963 Parents: d476811 Author: Mike Drob <md...@apache.org> Authored: Wed Apr 25 11:34:37 2018 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Thu Apr 26 09:28:59 2018 -0500 ---------------------------------------------------------------------- dev-support/hbase-personality.sh | 18 ------------------ .../src/main/resources/hbase/checkstyle.xml | 7 ++++++- 2 files changed, 6 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/90d103d6/dev-support/hbase-personality.sh ---------------------------------------------------------------------- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 2b1e2c3..b033645 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -631,24 +631,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 http://git-wip-us.apache.org/repos/asf/hbase/blob/90d103d6/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml ---------------------------------------------------------------------- diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml index c77d46b9..5b6f41f 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"/> + <property name="illegalClasses" value=" + org.apache.commons.logging.Log, + org.apache.commons.logging.LogFactory"/> </module> <!-- Javadoc Checks http://checkstyle.sourceforge.net/config_javadoc.html -->
