Skip to content

HBASE-26871 addendum. use the jar command from JAVA_HOME #4297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2022
Merged

HBASE-26871 addendum. use the jar command from JAVA_HOME #4297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...ded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions ...aded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down