Skip to content

HDDS-11588. Add main artifact jar to classpath file #7324

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
adoroszlai merged 9 commits into from
Oct 30, 2024
Merged

HDDS-11588. Add main artifact jar to classpath file #7324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66d6a19
copy dependencies per project
adoroszlai Sep 11, 2024
de6722f
fix dependency check
adoroszlai Sep 11, 2024
f565d94
exclude ozone-filesystem-shaded, which is base for hadoop2/3-specific…
adoroszlai Sep 12, 2024
f3731a4
copy classpath files instead of extracting them; avoid using profile,…
adoroszlai Sep 12, 2024
40c4c2d
do not override copy-jars from root POM
adoroszlai Oct 6, 2024
69edd90
HDDS-11588. Add main artifact jar to classpath file
adoroszlai Oct 16, 2024
1f88442
Quote variable
adoroszlai Oct 17, 2024
905ba86
Merge remote-tracking branch 'origin/master' into HDDS-11588
adoroszlai Oct 29, 2024
80cb09c
keep explanation
adoroszlai Oct 29, 2024
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
4 changes: 4 additions & 0 deletions hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" .
run cp -p -R "${ROOT}/hadoop-ozone/dist/src/main/keytabs" compose/_keytabs

for file in $(find "${ROOT}" -path '*/target/classes/*.classpath' | sort); do
# We need to add the artifact manually as it's not part the generated classpath desciptor
module=$(basename "${file%.classpath}")
sed -i -e "s;$;:\$HDDS_LIB_JARS_DIR/${module}-${HDDS_VERSION}.jar;" "$file"

cp -n -p -v "$file" share/ozone/classpath/
done

Expand Down
8 changes: 0 additions & 8 deletions hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2817,14 +2817,6 @@ function ozone_assemble_classpath() {
done
ozone_add_classpath "${OZONE_HOME}/share/ozone/web"

#We need to add the artifact manually as it's not part the generated classpath desciptor
local MAIN_ARTIFACT
MAIN_ARTIFACT=$(find "$HDDS_LIB_JARS_DIR" -name "${OZONE_RUN_ARTIFACT_NAME}-*.jar")
if [[ -z "$MAIN_ARTIFACT" ]] || [[ ! -e "$MAIN_ARTIFACT" ]]; then
echo "ERROR: Component jar file $MAIN_ARTIFACT is missing from ${HDDS_LIB_JARS_DIR}"
fi
ozone_add_classpath "${MAIN_ARTIFACT}"

#Add optional jars to the classpath
local OPTIONAL_CLASSPATH_DIR
OPTIONAL_CLASSPATH_DIR="${HDDS_LIB_JARS_DIR}/${OZONE_RUN_ARTIFACT_NAME}"
Expand Down