Skip to content

HADOOP-19594. Bump Maven 3.9.10 #7760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions BUILDING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@ Maven build goals:
OWASP's dependency-check plugin will scan the third party dependencies
of this project for known CVEs (security vulnerabilities against them).
It will produce a report in target/dependency-check-report.html. To
invoke, run 'mvn dependency-check:aggregate'. Note that this plugin
requires maven 3.1.1 or greater.
invoke, run 'mvn dependency-check:aggregate'.

PMDK library build options:

Expand Down Expand Up @@ -529,7 +528,7 @@ Requirements:

* Windows 10
* JDK 1.8
* Maven 3.0 or later (maven.apache.org)
* Maven 3.3 or later (maven.apache.org)
* Boost 1.86.0 (boost.org)
* Protocol Buffers 3.21.12 (https://github.com/protocolbuffers/protobuf/tags)
* CMake 3.19 or newer (cmake.org)
Expand Down
4 changes: 3 additions & 1 deletion dev-support/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
######
# Set env vars required to build Hadoop
######
ENV MAVEN_HOME /usr
ENV MAVEN_HOME /opt/maven
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

Expand All @@ -88,6 +89,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
# Install packages
####
RUN pkg-resolver/install-common-pkgs.sh
RUN pkg-resolver/install-maven.sh ubuntu:focal
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal
RUN pkg-resolver/install-boost.sh ubuntu:focal
RUN pkg-resolver/install-protobuf.sh ubuntu:focal
Expand Down
4 changes: 3 additions & 1 deletion dev-support/docker/Dockerfile_aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ ENV PYTHONIOENCODING=utf-8
######
# Set env vars required to build Hadoop
######
ENV MAVEN_HOME /usr
ENV MAVEN_HOME /opt/maven
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64

Expand Down Expand Up @@ -92,6 +93,7 @@ ENV QT_QPA_PLATFORM offscreen
# Install packages
####
RUN pkg-resolver/install-common-pkgs.sh
RUN pkg-resolver/install-maven.sh ubuntu:focal::arch64
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal::arch64
RUN pkg-resolver/install-boost.sh ubuntu:focal::arch64
RUN pkg-resolver/install-protobuf.sh ubuntu:focal::arch64
Expand Down
4 changes: 3 additions & 1 deletion dev-support/docker/Dockerfile_debian_10
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ RUN apt-get -q update \
######
# Set env vars required to build Hadoop
######
ENV MAVEN_HOME /usr
ENV MAVEN_HOME /opt/maven
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64

Expand All @@ -82,6 +83,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
####
# Install packages
####
RUN pkg-resolver/install-maven.sh debian:10
RUN pkg-resolver/install-cmake.sh debian:10
RUN pkg-resolver/install-spotbugs.sh debian:10
RUN pkg-resolver/install-boost.sh debian:10
Expand Down
4 changes: 3 additions & 1 deletion dev-support/docker/Dockerfile_ubuntu_24
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
######
# Set env vars required to build Hadoop
######
ENV MAVEN_HOME /usr
ENV MAVEN_HOME /opt/maven
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64

Expand All @@ -87,6 +88,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
####
# Install packages
####
RUN pkg-resolver/install-maven.sh ubuntu:noble
RUN pkg-resolver/install-spotbugs.sh ubuntu:noble
RUN pkg-resolver/install-boost.sh ubuntu:noble
RUN pkg-resolver/install-protobuf.sh ubuntu:noble
Expand Down
6 changes: 3 additions & 3 deletions dev-support/docker/Dockerfile_windows_10
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.8/binaries/apache-maven-3.8.8-bin.zip -OutFile $Env:TEMP\apache-maven-3.8.8-bin.zip
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8-bin.zip -DestinationPath "C:\Maven"
RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.9.10/binaries/apache-maven-3.9.10-bin.zip -OutFile $Env:TEMP\apache-maven-3.9.10-bin.zip
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.10-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
Expand Down Expand Up @@ -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.8.8\bin"
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.10\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"
Expand Down
12 changes: 6 additions & 6 deletions dev-support/docker/pkg-resolver/install-maven.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ if [ $? -eq 1 ]; then
exit 1
fi

default_version="3.6.3"
default_version="3.9.10"
version_to_install=$default_version
if [ -n "$2" ]; then
version_to_install="$2"
fi

if [ "$version_to_install" != "3.6.3" ]; then
if [ "$version_to_install" != "3.9.10" ]; 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.6.3" ]; then
if [ "$version_to_install" == "3.9.10" ]; then
mkdir -p /opt/maven /tmp/maven &&
curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz \
-o /tmp/maven/apache-maven-3.6.3-bin.tar.gz &&
tar xzf /tmp/maven/apache-maven-3.6.3-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.10/apache-maven-3.9.10-bin.tar.gz \
-o /tmp/maven/apache-maven-3.9.10-bin.tar.gz &&
tar xzf /tmp/maven/apache-maven-3.9.10-bin.tar.gz --strip-components 1 -C /opt/maven
else
echo "ERROR: Don't know how to install version $version_to_install"
exit 1
Expand Down
6 changes: 0 additions & 6 deletions dev-support/docker/pkg-resolver/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,6 @@
"centos:7": "make",
"centos:8": "make"
},
"maven": {
"debian:10": "maven",
"ubuntu:focal": "maven",
"ubuntu:noble": "maven",
"ubuntu:focal::arch64": "maven"
},
"java": {
"debian:10": "openjdk-11-jdk",
"ubuntu:focal": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Hadoop Auth, Java HTTP SPNEGO - Building It
Requirements
------------

* Java 7+
* Maven 3+
* JDK 1.8
* Maven 3.3 or later
* Kerberos KDC (for running Kerberos test cases)

Building
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -617,8 +617,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
dependencies of this project for known CVEs (security
vulnerabilities against them). It will produce a report
in target/dependency-check-report.html. To invoke, run
'mvn dependency-check:aggregate'. Note that this plugin
requires maven 3.1.1 or greater.
'mvn dependency-check:aggregate'.
-->
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
Expand Down