This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new e69da68f970 HBASE-26063 The current checkcompatibility.py script can
not compare master and rel/2.0.0 (#3457)
e69da68f970 is described below
commit e69da68f970d023d48532e44472de61cdbda47f3
Author: Duo Zhang <[email protected]>
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 <[email protected]>
---
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 4cfdc4afeae..67acbb35442 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
