This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new c8673124f ci: update Maven and .NET download URLs (#3030)
c8673124f is described below
commit c8673124fb03e49ff91def07395b4d83bfd6d08e
Author: David Li <[email protected]>
AuthorDate: Fri Jun 27 12:03:38 2025 +0900
ci: update Maven and .NET download URLs (#3030)
Fixes #3026.
---
.env | 4 ++--
ci/scripts/verify_ubuntu.sh | 42 +++++++++++++++++++++++++++------
compose.yaml | 2 +-
dev/release/verify-release-candidate.sh | 9 ++++---
4 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/.env b/.env
index 6ea223cfb..edc4aee18 100644
--- a/.env
+++ b/.env
@@ -28,9 +28,9 @@ ARCH_SHORT=amd64
ARCH_CONDA_FORGE=linux_64_
# Default versions for various dependencies
-JDK=11
+JDK=21
MANYLINUX=2014
-MAVEN=3.6.3
+MAVEN=3.9.10
PLATFORM=linux/amd64
PYTHON=3.9
GO=1.24.1
diff --git a/ci/scripts/verify_ubuntu.sh b/ci/scripts/verify_ubuntu.sh
index 0b1eef2c5..57b215145 100755
--- a/ci/scripts/verify_ubuntu.sh
+++ b/ci/scripts/verify_ubuntu.sh
@@ -24,15 +24,21 @@
set -euo pipefail
+: ${JDK:=21}
+: ${MAVEN:=3.9.10}
+
main() {
local -r source_dir="${1}"
# Install all the dependencies we need for all the subprojects
+ echo "JDK=${JDK}"
+ echo "MAVEN=${MAVEN}"
# When installing tzdata, don't block and wait for user input
export DEBIAN_FRONTEND=noninteractive
export TZ=Etc/UTC
+ echo "::group::Install APT dependencies"
apt update
apt install -y \
apt-transport-https \
@@ -62,9 +68,12 @@ main() {
ruby-full \
software-properties-common \
wget
+ echo "::endgroup::"
- # Install Java
-
+ echo "::group::Install Java"
+ echo "============================================================"
+ echo "Installing Java ${JDK}..."
+ echo "============================================================"
wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | \
gpg --dearmor | \
tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
@@ -72,21 +81,33 @@ main() {
echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F=
'/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | \
tee /etc/apt/sources.list.d/adoptium.list
- # Install Arrow GLib
+ apt update
+ apt install -y temurin-${JDK}-jdk
+ echo "::endgroup::"
+
+ echo "::group::Install Arrow GLib"
+ echo "============================================================"
+ echo "Installing Arrow GLib..."
+ echo "============================================================"
wget https://packages.apache.org/artifactory/arrow/$(lsb_release --id
--short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release
--codename --short).deb
apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release
--codename --short).deb
apt update
apt install -y \
libarrow-dev \
- libarrow-glib-dev \
- temurin-21-jdk
+ libarrow-glib-dev
+ echo "::endgroup::"
# Install Maven
- wget
https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+ echo "::group::Install Maven"
+ echo "============================================================"
+ echo "Installing Maven ${MAVEN}..."
+ echo "============================================================"
+ wget -O apache-maven.tar.gz
https://dlcdn.apache.org/maven/maven-3/${MAVEN}/binaries/apache-maven-${MAVEN}-bin.tar.gz
mkdir -p /opt/maven
- tar -C /opt/maven -xzvf apache-maven-3.9.9-bin.tar.gz --strip-components=1
+ tar -C /opt/maven -xzvf apache-maven.tar.gz --strip-components=1
export PATH=/opt/maven/bin:$PATH
+ echo "::endgroup::"
# Check if protoc is too old (Ubuntu 22.04). If so, install it from
# upstream instead.
@@ -95,17 +116,24 @@ main() {
sort --version-sort | \
head -n1 | \
grep -E '^3\.15.*$' >/dev/null ; then
+ echo "::group::Install protoc"
+ echo "============================================================"
+ echo "Installing protoc..."
+ echo "============================================================"
echo "protoc is too old"
wget -O protoc.zip
https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
unzip -o protoc.zip -d /usr/local -x readme.txt
+ echo "::endgroup::"
fi
# We run under Docker and this is necessary since the source dir is
# typically mounted as a volume
git config --global --add safe.directory "${source_dir}"
+ echo "::group::Verify"
"${source_dir}/dev/release/verify-release-candidate.sh"
+ echo "::endgroup::"
}
main "$@"
diff --git a/compose.yaml b/compose.yaml
index bcf85726f..091cfa3d6 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -87,7 +87,7 @@ services:
################################### Java ###################################
java-dist:
- image: ${ARCH}/maven:${MAVEN}-jdk-${JDK}
+ image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
volumes:
- .:/adbc:delegated
command: "/bin/bash -c '/adbc/ci/scripts/java_build.sh /adbc /adbc/dist &&
/adbc/ci/scripts/java_test.sh /adbc'"
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 78c61d604..ffe3fdfe1 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -273,9 +273,12 @@ install_dotnet() {
local
dotnet_download_thank_you_url=https://dotnet.microsoft.com/download/thank-you/dotnet-sdk-${dotnet_version}-${dotnet_platform}-x64-binaries
show_info "Getting .NET download URL from ${dotnet_download_thank_you_url}"
local dotnet_download_url=$(curl -sL ${dotnet_download_thank_you_url} | \
- grep 'directLink' | \
- grep -E -o 'https://download[^"]+' | \
- sed -n 2p)
+ grep 'recordManualDownload' | \
+ grep -E -o 'https://builds.dotnet[^"]+')
+ if [ -z "${dotnet_download_url}" ]; then
+ echo "Failed to get .NET download URL from
${dotnet_download_thank_you_url}"
+ exit 1
+ fi
show_info "Downloading .NET from ${dotnet_download_url}"
mkdir -p ${csharp_bin}
curl -sL ${dotnet_download_url} | \
