Skip to content

Commit c867312

Browse files
authored
ci: update Maven and .NET download URLs (#3030)
Fixes #3026.
1 parent 77f29cc commit c867312

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ARCH_SHORT=amd64
2828
ARCH_CONDA_FORGE=linux_64_
2929

3030
# Default versions for various dependencies
31-
JDK=11
31+
JDK=21
3232
MANYLINUX=2014
33-
MAVEN=3.6.3
33+
MAVEN=3.9.10
3434
PLATFORM=linux/amd64
3535
PYTHON=3.9
3636
GO=1.24.1

ci/scripts/verify_ubuntu.sh

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,21 @@
2424

2525
set -euo pipefail
2626

27+
: ${JDK:=21}
28+
: ${MAVEN:=3.9.10}
29+
2730
main() {
2831
local -r source_dir="${1}"
2932

3033
# Install all the dependencies we need for all the subprojects
34+
echo "JDK=${JDK}"
35+
echo "MAVEN=${MAVEN}"
3136

3237
# When installing tzdata, don't block and wait for user input
3338
export DEBIAN_FRONTEND=noninteractive
3439
export TZ=Etc/UTC
3540

41+
echo "::group::Install APT dependencies"
3642
apt update
3743
apt install -y \
3844
apt-transport-https \
@@ -62,31 +68,46 @@ main() {
6268
ruby-full \
6369
software-properties-common \
6470
wget
71+
echo "::endgroup::"
6572

66-
# Install Java
67-
73+
echo "::group::Install Java"
74+
echo "============================================================"
75+
echo "Installing Java ${JDK}..."
76+
echo "============================================================"
6877
wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | \
6978
gpg --dearmor | \
7079
tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
7180

7281
echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | \
7382
tee /etc/apt/sources.list.d/adoptium.list
7483

75-
# Install Arrow GLib
84+
apt update
85+
apt install -y temurin-${JDK}-jdk
86+
echo "::endgroup::"
87+
88+
echo "::group::Install Arrow GLib"
89+
echo "============================================================"
90+
echo "Installing Arrow GLib..."
91+
echo "============================================================"
7692
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
7793
apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
7894

7995
apt update
8096
apt install -y \
8197
libarrow-dev \
82-
libarrow-glib-dev \
83-
temurin-21-jdk
98+
libarrow-glib-dev
99+
echo "::endgroup::"
84100

85101
# Install Maven
86-
wget https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
102+
echo "::group::Install Maven"
103+
echo "============================================================"
104+
echo "Installing Maven ${MAVEN}..."
105+
echo "============================================================"
106+
wget -O apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/${MAVEN}/binaries/apache-maven-${MAVEN}-bin.tar.gz
87107
mkdir -p /opt/maven
88-
tar -C /opt/maven -xzvf apache-maven-3.9.9-bin.tar.gz --strip-components=1
108+
tar -C /opt/maven -xzvf apache-maven.tar.gz --strip-components=1
89109
export PATH=/opt/maven/bin:$PATH
110+
echo "::endgroup::"
90111

91112
# Check if protoc is too old (Ubuntu 22.04). If so, install it from
92113
# upstream instead.
@@ -95,17 +116,24 @@ main() {
95116
sort --version-sort | \
96117
head -n1 | \
97118
grep -E '^3\.15.*$' >/dev/null ; then
119+
echo "::group::Install protoc"
120+
echo "============================================================"
121+
echo "Installing protoc..."
122+
echo "============================================================"
98123
echo "protoc is too old"
99124

100125
wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
101126
unzip -o protoc.zip -d /usr/local -x readme.txt
127+
echo "::endgroup::"
102128
fi
103129

104130
# We run under Docker and this is necessary since the source dir is
105131
# typically mounted as a volume
106132
git config --global --add safe.directory "${source_dir}"
107133

134+
echo "::group::Verify"
108135
"${source_dir}/dev/release/verify-release-candidate.sh"
136+
echo "::endgroup::"
109137
}
110138

111139
main "$@"

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ services:
8787
################################### Java ###################################
8888

8989
java-dist:
90-
image: ${ARCH}/maven:${MAVEN}-jdk-${JDK}
90+
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
9191
volumes:
9292
- .:/adbc:delegated
9393
command: "/bin/bash -c '/adbc/ci/scripts/java_build.sh /adbc /adbc/dist && /adbc/ci/scripts/java_test.sh /adbc'"

dev/release/verify-release-candidate.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,12 @@ install_dotnet() {
273273
local dotnet_download_thank_you_url=https://dotnet.microsoft.com/download/thank-you/dotnet-sdk-${dotnet_version}-${dotnet_platform}-x64-binaries
274274
show_info "Getting .NET download URL from ${dotnet_download_thank_you_url}"
275275
local dotnet_download_url=$(curl -sL ${dotnet_download_thank_you_url} | \
276-
grep 'directLink' | \
277-
grep -E -o 'https://download[^"]+' | \
278-
sed -n 2p)
276+
grep 'recordManualDownload' | \
277+
grep -E -o 'https://builds.dotnet[^"]+')
278+
if [ -z "${dotnet_download_url}" ]; then
279+
echo "Failed to get .NET download URL from ${dotnet_download_thank_you_url}"
280+
exit 1
281+
fi
279282
show_info "Downloading .NET from ${dotnet_download_url}"
280283
mkdir -p ${csharp_bin}
281284
curl -sL ${dotnet_download_url} | \

0 commit comments

Comments
 (0)