diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index dbaab726876..46dd49ab634 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -62,7 +62,7 @@ versions += [ checkstyle: "8.36.2", commonsCli: "1.4", dropwizardMetrics: "4.1.12.1", - gradle: "7.5.1", + gradle: "7.6", grgit: "4.1.1", httpclient: "4.5.13", easymock: "4.3", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 593bdcca0f3..e9ee3c54406 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionSha=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 3c53cb3fbb8..a2e85319111 100755 --- a/gradlew +++ b/gradlew @@ -118,7 +118,7 @@ esac # Loop in case we encounter an error. for attempt in 1 2 3; do if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then - if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v7.5.1/gradle/wrapper/gradle-wrapper.jar"; then + if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v7.6.0/gradle/wrapper/gradle-wrapper.jar"; then rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" # Pause for a bit before looping in case the server throttled us. sleep 5 diff --git a/retry_zinc b/retry_zinc index 381b698ccff..959b44d7bea 100755 --- a/retry_zinc +++ b/retry_zinc @@ -28,17 +28,16 @@ # [2021-10-19T17:25:07.234Z] Lock file: /home/jenkins/.gradle/caches/7.0.2/zinc-1.3.5_2.13.6_8/zinc-1.3.5_2.13.6_8.lock set -uf -o pipefail -mkdir -p ./build +mkdir -p logs retryable=1 while [[ "$retryable" != 0 ]]; do retryable=0 - rm -f ./build/buildoutput.log - "$@" 2>&1 | tee ./build/buildoutput.log + "$@" 2>&1 | tee logs/buildoutput.log commandReturnCode=$? if [ $commandReturnCode -ne 0 ]; then - if grep "Timeout waiting to lock zinc" ./build/buildoutput.log; then + if grep "Timeout waiting to lock zinc" logs/buildoutput.log; then retryable=1 echo 'Retrying due to zinc lock timeout' continue