Merge "Improve verbosity in maven shell scripts"

diff --combined shell/maven-sonar.sh
index 17c509d,ae9648a..e0c0477
--- 1/shell/maven-sonar.sh
--- 2/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@@ -14,17 -14,18 +14,17 @@@
  
  # DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
  # Ensure we fail the job if any steps fail.
- set -e -o pipefail
+ set -xe -o pipefail
  set +u
  
  export MAVEN_OPTS
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
 -$MVN clean deploy \
 +$MVN clean install \
      -e -Dsonar \
      --global-settings "$GLOBAL_SETTINGS_FILE" \
      --settings "$SETTINGS_FILE" \
 -    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
      $MAVEN_OPTIONS $MAVEN_PARAMS
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
@@@ -33,4 -34,5 +33,4 @@@ $MVN $SONAR_MAVEN_GOAL 
      -e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
      --global-settings "$GLOBAL_SETTINGS_FILE" \
      --settings "$SETTINGS_FILE" \
 -    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
      $MAVEN_OPTIONS $MAVEN_PARAMS