From f78098b1e6716fec48ac47014e38dc3c1784b474 Mon Sep 17 00:00:00 2001
From: Huangjw <1223644280@qq.com>
Date: Mon, 26 Jun 2023 18:56:16 +0800
Subject: [PATCH] fix(cherry-pick): cherry pick 10287 10325 (#10568)

---
 ci/scripts/release.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh
index 3fc5260c3ad8c..facc10abab4b6 100755
--- a/ci/scripts/release.sh
+++ b/ci/scripts/release.sh
@@ -13,8 +13,8 @@ fi
 echo "--- Install java and maven"
 yum install -y java-11-openjdk wget python3
 pip3 install toml-cli
-wget https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.tar.gz && tar -zxvf apache-maven-3.9.1-bin.tar.gz
-export PATH="${REPO_ROOT}/apache-maven-3.9.1/bin:$PATH"
+wget https://dlcdn.apache.org/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz && tar -zxvf apache-maven-3.9.2-bin.tar.gz
+export PATH="${REPO_ROOT}/apache-maven-3.9.2/bin:$PATH"
 mvn -v
 
 echo "--- Install rust"
@@ -40,7 +40,7 @@ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip
 unzip -q awscliv2.zip && ./aws/install && mv /usr/local/bin/aws /bin/aws
 
 echo "--- Update risingwave release version"
-if [[ -n "${BUILDKITE_TAG+x}" ]]; then
+if [[ -n "${BUILDKITE_TAG}" ]]; then
   toml set --toml-path Cargo.toml workspace.package.version ${BUILDKITE_TAG#*v}
 fi
 
@@ -58,7 +58,7 @@ elif [[ -n "${BINARY_NAME+x}" ]]; then
     aws s3 cp risingwave-${BINARY_NAME}-x86_64-unknown-linux.tar.gz s3://risingwave-nightly-pre-built-binary
 fi
 
-if [[ -n "${BUILDKITE_TAG+x}" ]]; then
+if [[ -n "${BUILDKITE_TAG}" ]]; then
   echo "--- Install gh cli"
   yum install -y dnf
   dnf install -y 'dnf-command(config-manager)'