HBASE-19377 Update Java API CC version Compatibility checker complaining about hash collisions, newer versions use longer id strings.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2a35205f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2a35205f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2a35205f Branch: refs/heads/branch-1.4 Commit: 2a35205fd9dcd609111312490e72f1c0a4f924ee Parents: 9f6be5a Author: Mike Drob <md...@apache.org> Authored: Tue Jun 12 13:23:13 2018 -0500 Committer: Mike Drob <md...@apache.org> Committed: Tue Jun 12 15:14:09 2018 -0500 ---------------------------------------------------------------------- dev-support/checkcompatibility.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2a35205f/dev-support/checkcompatibility.py ---------------------------------------------------------------------- diff --git a/dev-support/checkcompatibility.py b/dev-support/checkcompatibility.py index ad1f774..220faaa 100755 --- a/dev-support/checkcompatibility.py +++ b/dev-support/checkcompatibility.py @@ -156,7 +156,7 @@ def checkout_java_acc(force): logging.info("Downloading Java ACC...") - url = "https://github.com/lvc/japi-compliance-checker/archive/2.1.tar.gz"; + url = "https://github.com/lvc/japi-compliance-checker/archive/2.4.tar.gz"; scratch_dir = get_scratch_dir() path = os.path.join(scratch_dir, os.path.basename(url)) jacc = urllib2.urlopen(url) @@ -166,7 +166,7 @@ def checkout_java_acc(force): subprocess.check_call(["tar", "xzf", path], cwd=scratch_dir) - shutil.move(os.path.join(scratch_dir, "japi-compliance-checker-2.1"), + shutil.move(os.path.join(scratch_dir, "japi-compliance-checker-2.4"), os.path.join(acc_dir)) @@ -266,6 +266,12 @@ def process_java_acc_output(output): return_value[line[:6]] = values return return_value +def log_java_acc_version(): + java_acc_path = os.path.join( + get_java_acc_dir(), "japi-compliance-checker.pl") + + args = ["perl", java_acc_path, "-version"] + logging.info(check_output(args)) def run_java_acc(src_name, src_jars, dst_name, dst_jars, annotations, skip_annotations, name): """ Run the compliance checker to compare 'src' and 'dst'. """ @@ -479,6 +485,7 @@ def main(): # Download deps. checkout_java_acc(args.force_download) + log_java_acc_version() # Set up the build. scratch_dir = get_scratch_dir()
