[hbase] branch master updated: HBASE-26063 The current checkcompatibility.py script can not compare master and rel/2.0.0 (#3457)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 934fe02  HBASE-26063 The current checkcompatibility.py script can not compare master and rel/2.0.0 (#3457)
934fe02 is described below

commit 934fe02e7866610e92867f00458012168ea65e48
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Jul 3 21:46:05 2021 +0800

    HBASE-26063 The current checkcompatibility.py script can not compare master and rel/2.0.0 (#3457)
    
    Signed-off-by: Yulin Niu <ni...@apache.org>
---
 dev-support/checkcompatibility.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-support/checkcompatibility.py b/dev-support/checkcompatibility.py
index e251d91..6061326 100755
--- a/dev-support/checkcompatibility.py
+++ b/dev-support/checkcompatibility.py
@@ -136,6 +136,8 @@ def get_repo_name(remote_name="origin"):
 def build_tree(java_path, verbose):
     """ Run the Java build within 'path'. """
     logging.info("Building in %s ", java_path)
+    # special hack for comparing with rel/2.0.0, see HBASE-26063 for more details
+    subprocess.check_call(["sed", "-i", "2148s/3.0.0/3.0.4/g", "pom.xml"], cwd=java_path)
     mvn_cmd = ["mvn", "--batch-mode", "-DskipTests",
                "-Dmaven.javadoc.skip=true", "package"]
     if not verbose:
@@ -172,7 +174,7 @@ def checkout_java_acc(force):
 
 def find_jars(path):
     """ Return a list of jars within 'path' to be checked for compatibility. """
-    all_jars = set(check_output(["find", path, "-name", "*.jar"]).splitlines())
+    all_jars = set(check_output(["find", path, "-type", "f", "-name", "*.jar"]).splitlines())
 
     return [j for j in all_jars if (
         "-tests" not in j and