diff --git a/.github/workflows/velox_backend_x86.yml b/.github/workflows/velox_backend_x86.yml index 1e4b6fb24af..c90c24ea691 100644 --- a/.github/workflows/velox_backend_x86.yml +++ b/.github/workflows/velox_backend_x86.yml @@ -555,7 +555,7 @@ jobs: matrix: spark: [ "spark-3.3" ] uniffle: [ "0.10.0" ] - hadoop: [ "2.8.5" ] + hadoop: [ "2.10.2" ] runs-on: ubuntu-22.04 container: apache/gluten:centos-8-jdk8 steps: @@ -574,10 +574,10 @@ jobs: run: | export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk if [ ! -e "/opt/apache-uniffle-${{ matrix.uniffle }}-bin.tar.gz" ]; then - ${WGET_CMD} https://archive.apache.org/dist/uniffle/${{ matrix.uniffle }}/apache-uniffle-${{ matrix.uniffle }}-bin.tar.gz -P /opt + ${WGET_CMD} https://www.apache.org/dyn/closer.lua/uniffle/${{ matrix.uniffle }}/apache-uniffle-${{ matrix.uniffle }}-bin.tar.gz?action=download -O /opt/apache-uniffle-${{ matrix.uniffle }}-bin.tar.gz fi if [ ! -e "/opt/hadoop-${{ matrix.hadoop }}.tar.gz" ]; then - ${WGET_CMD} https://archive.apache.org/dist/hadoop/common/hadoop-${{ matrix.hadoop }}/hadoop-${{ matrix.hadoop }}.tar.gz -P /opt + ${WGET_CMD} https://www.apache.org/dyn/closer.lua/hadoop/common/hadoop-${{ matrix.hadoop }}/hadoop-${{ matrix.hadoop }}.tar.gz?action=download -O /opt/hadoop-${{ matrix.hadoop }}.tar.gz fi cd /opt && rm -rf shims && \ mkdir /opt/uniffle && tar xzf apache-uniffle-${{ matrix.uniffle }}-bin.tar.gz -C /opt/uniffle --strip-components=1 && \ diff --git a/dev/docker/Dockerfile.centos8-dynamic-build b/dev/docker/Dockerfile.centos8-dynamic-build index 90435d04125..ff1fb48a863 100644 --- a/dev/docker/Dockerfile.centos8-dynamic-build +++ b/dev/docker/Dockerfile.centos8-dynamic-build @@ -37,7 +37,7 @@ RUN set -ex; \ wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -O /opt/apache-celeborn-0.5.4-bin.tgz; \ wget -nv ${mirror_host}/celeborn/celeborn-0.6.3/apache-celeborn-0.6.3-bin.tgz?action=download -O /opt/apache-celeborn-0.6.3-bin.tgz; \ wget -nv ${mirror_host}/uniffle/0.10.0/apache-uniffle-0.10.0-bin.tar.gz?action=download -O /opt/apache-uniffle-0.10.0-bin.tar.gz; \ - wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz?action=download -O /opt/hadoop-2.8.5.tar.gz; \ + wget -nv ${mirror_host}/hadoop/common/hadoop-2.10.2/hadoop-2.10.2.tar.gz?action=download -O /opt/hadoop-2.10.2.tar.gz; \ git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ cd /opt/gluten/.github/workflows/util/; \ ./install-spark-resources.sh 3.3; \ diff --git a/dev/docker/Dockerfile.centos9-dynamic-build b/dev/docker/Dockerfile.centos9-dynamic-build index 980737df7b1..053cc578515 100644 --- a/dev/docker/Dockerfile.centos9-dynamic-build +++ b/dev/docker/Dockerfile.centos9-dynamic-build @@ -35,7 +35,6 @@ RUN set -ex; \ wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -O /opt/apache-celeborn-0.5.4-bin.tgz; \ wget -nv ${mirror_host}/celeborn/celeborn-0.6.3/apache-celeborn-0.6.3-bin.tgz?action=download -O /opt/apache-celeborn-0.6.3-bin.tgz; \ wget -nv ${mirror_host}/uniffle/0.10.0/apache-uniffle-0.10.0-bin.tar.gz?action=download -O /opt/apache-uniffle-0.10.0-bin.tar.gz; \ - wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz?action=download -O /opt/hadoop-2.8.5.tar.gz; \ git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ cd /opt/gluten/.github/workflows/util/; \ ./install-spark-resources.sh 3.3; \ diff --git a/dev/vcpkg/setup-build-depends.sh b/dev/vcpkg/setup-build-depends.sh index 6cca372a194..1a5ed490138 100755 --- a/dev/vcpkg/setup-build-depends.sh +++ b/dev/vcpkg/setup-build-depends.sh @@ -25,7 +25,7 @@ function semver { install_maven_from_source() { if [ -z "$(which mvn)" ]; then - maven_version=3.9.12 + maven_version=3.9.16 maven_install_dir=/opt/maven-$maven_version if [ -d /opt/maven-$maven_version ]; then echo "Failed to install maven: ${maven_install_dir} is exists" >&2 diff --git a/pom.xml b/pom.xml index 2be98cafe12..d2e8c3ab82b 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 2.15.0 4.13.1 - 3.9.12 + 3.9.16 5.11.4 0.62.2