From 45a931024ea519fe81ee1f4cfa21f3445152bca7 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Thu, 26 Apr 2018 20:12:07 -0500 Subject: [PATCH] HBASE-20478 move hbaseanti import checks to checkstyle --- dev-support/hbase-personality.sh | 18 ------------------ .../src/main/resources/hbase/checkstyle.xml | 7 ++++++- pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 2b1e2c34f9..b0336458d0 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 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"/> + diff --git a/pom.xml b/pom.xml index 7aede4ada8..90e3f73b14 100755 --- a/pom.xml +++ b/pom.xml @@ -1500,7 +1500,7 @@ 1.5.0-alpha.15 3.0.0 1.4 - 6.18 + 8.9 1.6.0 2.2.0 1.3.9-1 @@ -1509,7 +1509,7 @@ 1.0.0 1.8 3.3.0 - 2.17 + 3.0.0 3.6.1 3.0.1 2.10 -- 2.16.1