You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2022/03/30 19:42:40 UTC
[hbase] branch branch-2 updated: HBASE-26871 addendum. use the jar command from JAVA_HOME (#4297)
This is an automated email from the ASF dual-hosted git repository.
busbey 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 bb18f40 HBASE-26871 addendum. use the jar command from JAVA_HOME (#4297)
bb18f40 is described below
commit bb18f407c0b1cba541e2e62b7fa6ba17c67c572f
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Mar 30 14:41:51 2022 -0500
HBASE-26871 addendum. use the jar command from JAVA_HOME (#4297)
---
.../src/test/resources/ensure-jars-have-correct-contents.sh | 10 ++++++++--
.../src/test/resources/ensure-jars-have-correct-contents.sh | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index fbc48d1..f9fc294 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++ b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -48,6 +48,12 @@ do
esac
done
+if [ -z "${JAVA_HOME}" ]; then
+ echo "[ERROR] Must have JAVA_HOME defined." 1>&2
+ exit 1
+fi
+JAR="${JAVA_HOME}/bin/jar"
+
# should still have jars to check.
if [ $# -lt 1 ]; then
usage
@@ -113,8 +119,8 @@ allowed_expr+=")"
declare -i bad_artifacts=0
declare -a bad_contents
for artifact in "${artifact_list[@]}"; do
- bad_contents=($(jar tf "${artifact}" | grep -v -E "${allowed_expr}" || true))
- class_count=$(jar tf "${artifact}" | grep -c -E '\.class$' || true)
+ bad_contents=($("${JAR}" tf "${artifact}" | grep -v -E "${allowed_expr}" || true))
+ class_count=$("${JAR}" tf "${artifact}" | grep -c -E '\.class$' || true)
if [ ${#bad_contents[@]} -eq 0 ] && [ "${class_count}" -lt 1 ]; then
bad_contents=("The artifact contains no java class files.")
fi
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index fbc48d1..f9fc294 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -48,6 +48,12 @@ do
esac
done
+if [ -z "${JAVA_HOME}" ]; then
+ echo "[ERROR] Must have JAVA_HOME defined." 1>&2
+ exit 1
+fi
+JAR="${JAVA_HOME}/bin/jar"
+
# should still have jars to check.
if [ $# -lt 1 ]; then
usage
@@ -113,8 +119,8 @@ allowed_expr+=")"
declare -i bad_artifacts=0
declare -a bad_contents
for artifact in "${artifact_list[@]}"; do
- bad_contents=($(jar tf "${artifact}" | grep -v -E "${allowed_expr}" || true))
- class_count=$(jar tf "${artifact}" | grep -c -E '\.class$' || true)
+ bad_contents=($("${JAR}" tf "${artifact}" | grep -v -E "${allowed_expr}" || true))
+ class_count=$("${JAR}" tf "${artifact}" | grep -c -E '\.class$' || true)
if [ ${#bad_contents[@]} -eq 0 ] && [ "${class_count}" -lt 1 ]; then
bad_contents=("The artifact contains no java class files.")
fi