From 8392d11d7b9db3006831eb2314c2c5d0b9eb8459 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 28 Oct 2021 14:37:28 -0400 Subject: [PATCH] 18273: Set docker gradle version Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/java-v2/test-in-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/java-v2/test-in-docker.sh b/sdk/java-v2/test-in-docker.sh index c685005c0d..e811cb2481 100755 --- a/sdk/java-v2/test-in-docker.sh +++ b/sdk/java-v2/test-in-docker.sh @@ -30,7 +30,7 @@ version_from_git() { declare $(format_last_commit_here "git_ts=%ct git_hash=%h") ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)" echo "$ARVADOS_BUILDING_VERSION" -} +} nohash_version_from_git() { version_from_git $1 | cut -d. -f1-3 @@ -45,4 +45,4 @@ else build_version="$(version_from_git)" fi #UID=$(id -u) # UID is read-only on many systems -exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c 'gradle clean && gradle test && gradle jar install '"$gradle_upload" \ No newline at end of file +exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle:5.3.1 /bin/sh -c 'gradle clean && gradle test && gradle jar install '"$gradle_upload" -- 2.30.2