You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/05/02 02:58:57 UTC
[07/43] hbase git commit: Revert "HBASE-20478 move hbaseanti import
checks to checkstyle"
Revert "HBASE-20478 move hbaseanti import checks to checkstyle"
Need to update version of checkstyle used for new features.
This reverts commit 90d103d6d555871f59ffa0d099dc1f9d3970b963.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e6220c8b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e6220c8b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e6220c8b
Branch: refs/heads/HBASE-19064
Commit: e6220c8b605c9bc5ad7fe88b26f68a6d1874d39f
Parents: 90d103d
Author: Mike Drob <md...@apache.org>
Authored: Thu Apr 26 13:36:13 2018 -0500
Committer: Mike Drob <md...@apache.org>
Committed: Thu Apr 26 13:36:13 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 18 ++++++++++++++++++
.../src/main/resources/hbase/checkstyle.xml | 7 +------
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6220c8b/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index b033645..2b1e2c3 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
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6220c8b/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 5b6f41f..c77d46b9 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"/>
- <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 -->