From 7ce1c9d0d63add592bad08a637cc7b2d7ccb60cf Mon Sep 17 00:00:00 2001
From: Francis Chuang <francischuang@apache.org>
Date: Sat, 11 Nov 2023 19:04:32 +1100
Subject: [PATCH] [CALCITE-6106] Switch from gradle to eclipse-temurin image
 for avatica docker-compose release commands

---
 docker-compose.yml      | 10 +++++-----
 docker.sh               | 10 +++++-----
 site/docker-compose.yml |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2f52811896..b26b6a53ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@
 version: '3'
 services:
   dry-run:
-    image: gradle:7.4.2-jdk17
+    image: eclipse-temurin:19
     working_dir: /src
     command: sh -c "./docker.sh dry-run"
     network_mode: "host"
@@ -26,7 +26,7 @@ services:
       - gradle-cache:/home/gradle/.gradle
 
   publish-release-for-voting:
-    image: gradle:7.4.2-jdk17
+    image: eclipse-temurin:19
     working_dir: /src
     command: sh -c "./docker.sh publish-release-for-voting"
     volumes:
@@ -34,7 +34,7 @@ services:
       - gradle-cache:/home/gradle/.gradle
 
   clean:
-    image: gradle:7.4.2-jdk17
+    image: eclipse-temurin:19
     working_dir: /src
     command: sh -c "./docker.sh clean"
     volumes:
@@ -42,7 +42,7 @@ services:
       - gradle-cache:/home/gradle/.gradle
 
   promote-release:
-    image: gradle:7.4.2-jdk17
+    image: eclipse-temurin:19
     working_dir: /src
     command: sh -c "./docker.sh promote-release"
     volumes:
@@ -50,7 +50,7 @@ services:
       - gradle-cache:/home/gradle/.gradle
 
   test:
-    image: gradle:7.4.2-jdk17
+    image: eclipse-temurin:19
     working_dir: /src
     command: sh -c "./docker.sh test"
     volumes:
diff --git a/docker.sh b/docker.sh
index b03ebfa5a4..3c7981dd0f 100755
--- a/docker.sh
+++ b/docker.sh
@@ -248,7 +248,7 @@ promote_release(){
     fi
 
     get_asf_credentials
-    gradle publishDist -Pasf -PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER -Pasf.git.pushRepositoryProvider=GITBOX
+    ./gradlew publishDist -Pasf -PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER -Pasf.git.pushRepositoryProvider=GITBOX
 
     # If there is more than 1 release, delete all of them, except for the newest one
     # To do this, we do the following:
@@ -285,7 +285,7 @@ case $1 in
         select_gpg_key
         get_dry_run_build_configuration
 
-        gradle prepareVote -PasfTestSvnUsername=test -PasfTestSvnPassword=test -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY
+        ./gradlew prepareVote -PasfTestSvnUsername=test -PasfTestSvnPassword=test -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY
         ;;
 
     publish-release-for-voting)
@@ -295,11 +295,11 @@ case $1 in
         get_build_configuration
         get_asf_credentials
 
-        gradle prepareVote -Pasf -PasfCommitterId=$ASF_USERNAME -PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY -Pasf.git.pushRepositoryProvider=GITBOX
+        ./gradlew prepareVote -Pasf -PasfCommitterId=$ASF_USERNAME -PasfSvnUsername=$ASF_USERNAME -PasfSvnPassword=$ASF_PASSWORD -PasfNexusUsername=$ASF_USERNAME -PasfNexusPassword=$ASF_PASSWORD -PasfGitSourceUsername=$ASF_USERNAME -PasfGitSourcePassword=$ASF_PASSWORD -Prc=$RC_NUMBER -PuseGpgCmd -Psigning.gnupg.keyName=$SELECTED_GPG_KEY -Pasf.git.pushRepositoryProvider=GITBOX
         ;;
 
     clean)
-        gradle clean
+        ./gradlew clean
         ;;
 
     promote-release)
@@ -307,7 +307,7 @@ case $1 in
         ;;
 
     test)
-        gradle test
+        ./gradlew test
         ;;
 
     *)
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 5a15308da0..f6cd6fba3e 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     volumes:
       - .:/srv/jekyll
   generate-javadoc:
-    image: openjdk:17
+    image: eclipse-temurin:19
     working_dir: /usr/src/calcite-avatica
     command: sh -c "./gradlew javadocAggregate; rm -rf site/target/avatica/javadocAggregate; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
     volumes: