Merge branch '2.1.x'

Author: philwebb

ci/scripts/detect-jdk-updates.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 case "$JDK_VERSION" in
 	java8)

ci/scripts/promote.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 source $(dirname $0)/common.sh
 
@@ -31,7 +30,7 @@ curl \
 	-f \
 	-X \
 	POST "${ARTIFACTORY_SERVER}/api/build/promote/${buildName}/${buildNumber}" > /dev/null || {
-		result=$( curl -s -u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD}  -f  "${ARTIFACTORY_SERVER}/api/build/${buildName}/${buildNumber}" )
+		result=$( curl -s -f -u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD} "${ARTIFACTORY_SERVER}/api/build/${buildName}/${buildNumber}" )
 		resultRepo=$( echo $result | jq -r '.buildInfo.statuses[0].repository' )
 		if [[ $resultRepo = "libs-release-local" ]]; then
 			echo "Already promoted"

ci/scripts/sync-to-maven-central.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 buildName=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.name' )
 buildNumber=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.number' )