Simplify packer-parameters macro name to just lf

[releng/global-jjb.git] / shell / maven-deploy.sh

diff --git a/shell/maven-deploy.sh b/shell/maven-deploy.sh
index 15928ee..c30963b 100644 (file)
--- a/shell/maven-deploy.sh
+++ b/shell/maven-deploy.sh
@@ -20,9 +20,11 @@ set -eu -o pipefail
 m2repo_dir="$WORKSPACE/m2repo"
 nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
 
+lftools_activate
+
 # Remove metadata files that were not updated.
 set +e  # Temporarily disable to run diff command.
-IFS=" " read -r -a metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
+mapfile -t metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
     | grep 'Files .* and .* are identical' \
     | awk '{print $2}')"
 set -e  # Re-enable.
@@ -30,11 +32,12 @@ set -e  # Re-enable.
 set +u  # $metadata_files could be unbound if project is new.
 if [ -n "${metadata_files[*]}" ]; then
     for i in "${metadata_files[@]}"; do
+        echo "Removing unmodified file $i"
         rm "$i"*
     done
 fi
 set -u  # Re-enable.
 
 find "$m2repo_dir" -type d -empty -delete
-
+maven_metadata_validate "$m2repo_dir"
 lftools deploy nexus -s "$nexus_repo_url" "$m2repo_dir"