X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-merge-master;h=47cd9fdb4a6bf01fc90c97abe048c41969c89bf1;hb=9ace820ccb26638aad261697cb0a180e77af95e2;hp=6f84d99de50e52747b30e9bfd8868232e4358472;hpb=743eab353a2412ea2b52d7555bf50b1f95041ba3;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/github-maven-maven-merge-master b/.jjb-test/expected-xml/github-maven-maven-merge-master
index 6f84d99d..47cd9fdb 100644
--- a/.jjb-test/expected-xml/github-maven-maven-merge-master
+++ b/.jjb-test/expected-xml/github-maven-maven-merge-master
@@ -423,7 +423,7 @@ $MVN clean deploy \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
-    $MAVEN_PARAMS $MAVEN_OPTIONS
+    $MAVEN_OPTIONS $MAVEN_PARAMS
 
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
@@ -449,8 +449,9 @@ nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
 
 # Remove metadata files that were not updated.
 set +e  # Temporarily disable to run diff command.
-metadata_files=($(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
-    | grep 'Files .* and .* are identical' | awk '{print $2}'))
+IFS=" " read -r -a metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
+    | grep 'Files .* and .* are identical' \
+    | awk '{print $2}')"
 set -e  # Re-enable.
 
 set +u  # $metadata_files could be unbound if project is new.