This is an automated email from the ASF dual-hosted git repository. pan3793 pushed a commit to branch branch-3.5 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit ffbad4e1d77d88d25870382aedbf1882175dd580 Author: Cheng Pan <[email protected]> AuthorDate: Fri May 8 11:44:25 2026 +0800 HADOOP-19883. Upgrade Maven to 3.9.15 (#8479) Reviewed-by: Shilun Fan <[email protected]> Signed-off-by: Cheng Pan <[email protected]> --- .mvn/wrapper/maven-wrapper.properties | 4 ++-- BUILDING.txt | 10 +++++----- dev-support/docker/Dockerfile_windows_10 | 6 +++--- dev-support/docker/pkg-resolver/install-maven.sh | 12 ++++++------ dev-support/win-paths-eg.cmd | 2 +- pom.xml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 3ec5ff83c07..52a67d92faf 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -17,7 +17,7 @@ # wrapperVersion=3.3.4 distributionType=source -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip -distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionSha256Sum=b0d9292f06c5faded31ddcb6cb69099f316d6fea40a7778624b259bad9fed18a wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar wrapperSha256Sum=4e2fbf6554bc8a4702cdfdd3bef464f423393d784ddbb037216320ce55d5e4e1 diff --git a/BUILDING.txt b/BUILDING.txt index 10912934caf..c12d8da44fa 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -5,7 +5,7 @@ Requirements: * Unix System * JDK 17 -* Maven 3.9.11 or later (optional, a compatible version is automatically downloaded if using ./mvnw) +* Maven 3.9.15 or later (optional, a compatible version is automatically downloaded if using ./mvnw) * Boost 1.86.0 (if compiling native code) * Protocol Buffers 3.25.5 (if compiling native code) * CMake 3.19 or newer (if compiling native code) @@ -75,9 +75,9 @@ Installing required packages for clean install of Ubuntu 24.04 LTS Desktop. Install an up-to-date version of Maven manually, or use mvnw command, which will download one and validate it before execution. Following commands can be used to download and install required version of Maven manually if mvnw is not used: - $ curl -L https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.tar.gz > apache-maven-3.9.11-bin.tar.gz - $ tar -zxvf apache-maven-3.9.11-bin.tar.gz -C /opt - $ sudo ln -s /opt/apache-maven-3.9.11/bin/mvn /usr/bin + $ curl -L https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.tar.gz > apache-maven-3.9.15-bin.tar.gz + $ tar -zxvf apache-maven-3.9.15-bin.tar.gz -C /opt + $ sudo ln -s /opt/apache-maven-3.9.15/bin/mvn /usr/bin * Native libraries $ sudo apt-get -y install build-essential autoconf automake libtool cmake zlib1g-dev pkg-config libssl-dev libsasl2-dev * Protocol Buffers 3.25.5 (required to build native code) @@ -549,7 +549,7 @@ Requirements: * Windows 10 * JDK 17 -* Maven 3.9.11 or later (maven.apache.org, optional, a compatible version is automatically downloaded if using mvnw.cmd) +* Maven 3.9.15 or later (maven.apache.org, optional, a compatible version is automatically downloaded if using mvnw.cmd) * Boost 1.86.0 (boost.org) * Protocol Buffers 3.25.5 (https://github.com/protocolbuffers/protobuf/tags) * CMake 3.19 or newer (cmake.org) diff --git a/dev-support/docker/Dockerfile_windows_10 b/dev-support/docker/Dockerfile_windows_10 index 9ca20fd892c..21c8bbde56d 100644 --- a/dev-support/docker/Dockerfile_windows_10 +++ b/dev-support/docker/Dockerfile_windows_10 @@ -62,8 +62,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1 RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java" # Install Apache Maven. -RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip -OutFile $Env:TEMP\apache-maven-3.9.11-bin.zip -RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.11-bin.zip -DestinationPath "C:\Maven" +RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.9.15/binaries/apache-maven-3.9.15-bin.zip -OutFile $Env:TEMP\apache-maven-3.9.15-bin.zip +RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.15-bin.zip -DestinationPath "C:\Maven" # Install CMake 3.19.0. RUN powershell Invoke-WebRequest -URI https://cmake.org/files/v3.19/cmake-3.19.0-win64-x64.zip -OutFile $Env:TEMP\cmake-3.19.0-win64-x64.zip @@ -141,7 +141,7 @@ ENV MAVEN_OPTS '-Xmx2048M -Xss128M' ENV IS_WINDOWS 1 RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" RUN setx PATH "%PATH%;%JAVA_HOME%\bin" -RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.11\bin" +RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.15\bin" RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin" RUN setx PATH "%PATH%;C:\ZStd" RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin" diff --git a/dev-support/docker/pkg-resolver/install-maven.sh b/dev-support/docker/pkg-resolver/install-maven.sh index 16ecc8cfb4e..72502eaa5e3 100644 --- a/dev-support/docker/pkg-resolver/install-maven.sh +++ b/dev-support/docker/pkg-resolver/install-maven.sh @@ -27,22 +27,22 @@ if [ $? -eq 1 ]; then exit 1 fi -default_version="3.9.11" +default_version="3.9.15" version_to_install=$default_version if [ -n "$2" ]; then version_to_install="$2" fi -if [ "$version_to_install" != "3.9.11" ]; then +if [ "$version_to_install" != "3.9.15" ]; then echo "WARN: Don't know how to install version $version_to_install, installing the default version $default_version instead" version_to_install=$default_version fi -if [ "$version_to_install" == "3.9.11" ]; then +if [ "$version_to_install" == "3.9.15" ]; then mkdir -p /opt/maven /tmp/maven && - curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.tar.gz \ - -o /tmp/maven/apache-maven-3.9.11-bin.tar.gz && - tar xzf /tmp/maven/apache-maven-3.9.11-bin.tar.gz --strip-components 1 -C /opt/maven + curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.tar.gz \ + -o /tmp/maven/apache-maven-3.9.15-bin.tar.gz && + tar xzf /tmp/maven/apache-maven-3.9.15-bin.tar.gz --strip-components 1 -C /opt/maven else echo "ERROR: Don't know how to install version $version_to_install" exit 1 diff --git a/dev-support/win-paths-eg.cmd b/dev-support/win-paths-eg.cmd index ed5cefa6bb1..595554068de 100644 --- a/dev-support/win-paths-eg.cmd +++ b/dev-support/win-paths-eg.cmd @@ -38,7 +38,7 @@ SET MAVEN_OPTS=-Dmaven.repo.local=C:\Tools\m2 @REM command path @REM -SET MAVEN_HOME=C:\Tools\apache-maven-3.9.11 +SET MAVEN_HOME=C:\Tools\apache-maven-3.9.15 SET JAVA_HOME=C:\Tools\jdk SET MSVS=C:\Program Files (x86)\Microsoft Visual Studio 12.0 SET PROTO_BIN=C:\Tools\protobuf-2.5.0 diff --git a/pom.xml b/pom.xml index ce31f4a7db8..759090704e2 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x for an open-ended enforcement --> <enforced.java.version>[${javac.version},)</enforced.java.version> - <enforced.maven.version>[3.9.11,)</enforced.maven.version> + <enforced.maven.version>[3.9.15,)</enforced.maven.version> </properties> <modules> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
