Skip to content

Commit 84f8dae

Browse files
szetszwoszetszwo
committed
Merge branch 'trunk' into HADOOP-19359b
2 parents 43c0de7 + dd8cd2e commit 84f8dae

File tree

139 files changed

+11071
-426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+11071
-426
lines changed

‎BUILDING.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ Maven build goals:
279279
OWASP's dependency-check plugin will scan the third party dependencies
280280
of this project for known CVEs (security vulnerabilities against them).
281281
It will produce a report in target/dependency-check-report.html. To
282-
invoke, run 'mvn dependency-check:aggregate'. Note that this plugin
283-
requires maven 3.1.1 or greater.
282+
invoke, run 'mvn dependency-check:aggregate'.
284283

285284
PMDK library build options:
286285

@@ -529,7 +528,7 @@ Requirements:
529528

530529
* Windows 10
531530
* JDK 1.8
532-
* Maven 3.0 or later (maven.apache.org)
531+
* Maven 3.3 or later (maven.apache.org)
533532
* Boost 1.86.0 (boost.org)
534533
* Protocol Buffers 3.21.12 (https://github.com/protocolbuffers/protobuf/tags)
535534
* CMake 3.19 or newer (cmake.org)

‎LICENSE-binary‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ com.google.http-client:google-http-client:1.46.3
269269
com.google.j2objc:j2objc-annotations:3.0.0
270270
com.google.oauth-client:google-oauth-client:1.37.0
271271
com.microsoft.azure:azure-storage:7.0.0
272-
com.nimbusds:nimbus-jose-jwt:9.37.2
272+
com.nimbusds:nimbus-jose-jwt:10.4
273273
com.zaxxer:HikariCP:4.0.3
274274
commons-beanutils:commons-beanutils:1.9.4
275275
commons-cli:commons-cli:1.9.0
@@ -302,36 +302,36 @@ io.grpc:grpc-stub:1.69.0
302302
io.grpc:grpc-stub:1.70.0
303303
io.grpc:grpc-util:1.70.0
304304
io.grpc:grpc-xds:1.70.0
305-
io.netty:netty-all:4.1.118.Final
306-
io.netty:netty-buffer:4.1.118.Final
307-
io.netty:netty-codec:4.1.118.Final
308-
io.netty:netty-codec-dns:4.1.118.Final
309-
io.netty:netty-codec-haproxy:4.1.118.Final
310-
io.netty:netty-codec-http:4.1.118.Final
311-
io.netty:netty-codec-http2:4.1.118.Final
312-
io.netty:netty-codec-memcache:4.1.118.Final
313-
io.netty:netty-codec-mqtt:4.1.118.Final
314-
io.netty:netty-codec-redis:4.1.118.Final
315-
io.netty:netty-codec-smtp:4.1.118.Final
316-
io.netty:netty-codec-socks:4.1.118.Final
317-
io.netty:netty-codec-stomp:4.1.118.Final
318-
io.netty:netty-codec-xml:4.1.118.Final
319-
io.netty:netty-common:4.1.118.Final
320-
io.netty:netty-handler:4.1.118.Final
321-
io.netty:netty-handler-proxy:4.1.118.Final
322-
io.netty:netty-resolver:4.1.118.Final
323-
io.netty:netty-resolver-dns:4.1.118.Final
324-
io.netty:netty-transport:4.1.118.Final
325-
io.netty:netty-transport-rxtx:4.1.118.Final
326-
io.netty:netty-transport-sctp:4.1.118.Final
327-
io.netty:netty-transport-udt:4.1.118.Final
328-
io.netty:netty-transport-classes-epoll:4.1.118.Final
329-
io.netty:netty-transport-native-unix-common:4.1.118.Final
330-
io.netty:netty-transport-classes-kqueue:4.1.118.Final
331-
io.netty:netty-resolver-dns-classes-macos:4.1.118.Final
332-
io.netty:netty-transport-native-epoll:4.1.118.Final
333-
io.netty:netty-transport-native-kqueue:4.1.118.Final
334-
io.netty:netty-resolver-dns-native-macos:4.1.118.Final
305+
io.netty:netty-all:4.1.127.Final
306+
io.netty:netty-buffer:4.1.127.Final
307+
io.netty:netty-codec:4.1.127.Final
308+
io.netty:netty-codec-dns:4.1.127.Final
309+
io.netty:netty-codec-haproxy:4.1.127.Final
310+
io.netty:netty-codec-http:4.1.127.Final
311+
io.netty:netty-codec-http2:4.1.127.Final
312+
io.netty:netty-codec-memcache:4.1.127.Final
313+
io.netty:netty-codec-mqtt:4.1.127.Final
314+
io.netty:netty-codec-redis:4.1.127.Final
315+
io.netty:netty-codec-smtp:4.1.127.Final
316+
io.netty:netty-codec-socks:4.1.127.Final
317+
io.netty:netty-codec-stomp:4.1.127.Final
318+
io.netty:netty-codec-xml:4.1.127.Final
319+
io.netty:netty-common:4.1.127.Final
320+
io.netty:netty-handler:4.1.127.Final
321+
io.netty:netty-handler-proxy:4.1.127.Final
322+
io.netty:netty-resolver:4.1.127.Final
323+
io.netty:netty-resolver-dns:4.1.127.Final
324+
io.netty:netty-transport:4.1.127.Final
325+
io.netty:netty-transport-rxtx:4.1.127.Final
326+
io.netty:netty-transport-sctp:4.1.127.Final
327+
io.netty:netty-transport-udt:4.1.127.Final
328+
io.netty:netty-transport-classes-epoll:4.1.127.Final
329+
io.netty:netty-transport-native-unix-common:4.1.127.Final
330+
io.netty:netty-transport-classes-kqueue:4.1.127.Final
331+
io.netty:netty-resolver-dns-classes-macos:4.1.127.Final
332+
io.netty:netty-transport-native-epoll:4.1.127.Final
333+
io.netty:netty-transport-native-kqueue:4.1.127.Final
334+
io.netty:netty-resolver-dns-native-macos:4.1.127.Final
335335
io.opencensus:opencensus-api:0.12.3
336336
io.opencensus:opencensus-api:0.31.1
337337
io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
@@ -358,9 +358,9 @@ org.apache.commons:commons-compress:1.26.1
358358
org.apache.commons:commons-configuration2:2.10.1
359359
org.apache.commons:commons-csv:1.9.0
360360
org.apache.commons:commons-digester:1.8.1
361-
org.apache.commons:commons-lang3:3.17.0
361+
org.apache.commons:commons-lang3:3.18.0
362362
org.apache.commons:commons-math3:3.6.1
363-
org.apache.commons:commons-text:1.10.0
363+
org.apache.commons:commons-text:1.14.0
364364
org.apache.commons:commons-validator:1.6
365365
org.apache.curator:curator-client:5.2.0
366366
org.apache.curator:curator-framework:5.2.0

‎dev-support/docker/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161
######
6262
# Set env vars required to build Hadoop
6363
######
64-
ENV MAVEN_HOME /usr
64+
ENV MAVEN_HOME=/opt/maven
65+
ENV PATH="${PATH}:${MAVEN_HOME}/bin"
6566
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
6768

@@ -88,6 +89,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8889
# Install packages
8990
####
9091
RUN pkg-resolver/install-common-pkgs.sh
92+
RUN pkg-resolver/install-maven.sh ubuntu:focal
9193
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal
9294
RUN pkg-resolver/install-boost.sh ubuntu:focal
9395
RUN pkg-resolver/install-protobuf.sh ubuntu:focal

‎dev-support/docker/Dockerfile_aarch64‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ ENV PYTHONIOENCODING=utf-8
6262
######
6363
# Set env vars required to build Hadoop
6464
######
65-
ENV MAVEN_HOME /usr
65+
ENV MAVEN_HOME=/opt/maven
66+
ENV PATH="${PATH}:${MAVEN_HOME}/bin"
6667
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6768
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
6869

@@ -92,6 +93,7 @@ ENV QT_QPA_PLATFORM offscreen
9293
# Install packages
9394
####
9495
RUN pkg-resolver/install-common-pkgs.sh
96+
RUN pkg-resolver/install-maven.sh ubuntu:focal::arch64
9597
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal::arch64
9698
RUN pkg-resolver/install-boost.sh ubuntu:focal::arch64
9799
RUN pkg-resolver/install-protobuf.sh ubuntu:focal::arch64

‎dev-support/docker/Dockerfile_debian_11‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ RUN apt-get -q update \
5454
######
5555
# Set env vars required to build Hadoop
5656
######
57-
ENV MAVEN_HOME=/usr
57+
ENV MAVEN_HOME=/opt/maven
58+
ENV PATH="${PATH}:${MAVEN_HOME}/bin"
5859
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
5960
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
6061

@@ -80,6 +81,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION=true
8081
####
8182
# Install packages
8283
####
84+
RUN pkg-resolver/install-maven.sh debian:11
8385
RUN pkg-resolver/install-cmake.sh debian:11
8486
RUN pkg-resolver/install-spotbugs.sh debian:11
8587
RUN pkg-resolver/install-boost.sh debian:11

‎dev-support/docker/Dockerfile_ubuntu_24‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161
######
6262
# Set env vars required to build Hadoop
6363
######
64-
ENV MAVEN_HOME /usr
64+
ENV MAVEN_HOME=/opt/maven
65+
ENV PATH="${PATH}:${MAVEN_HOME}/bin"
6566
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
6768

@@ -87,6 +88,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8788
####
8889
# Install packages
8990
####
91+
RUN pkg-resolver/install-maven.sh ubuntu:noble
9092
RUN pkg-resolver/install-spotbugs.sh ubuntu:noble
9193
RUN pkg-resolver/install-boost.sh ubuntu:noble
9294
RUN pkg-resolver/install-protobuf.sh ubuntu:noble

‎dev-support/docker/Dockerfile_windows_10‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1
6262
RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
6363

6464
# Install Apache Maven.
65-
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
66-
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8-bin.zip -DestinationPath "C:\Maven"
65+
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
66+
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.11-bin.zip -DestinationPath "C:\Maven"
6767

6868
# Install CMake 3.19.0.
6969
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'
141141
ENV IS_WINDOWS 1
142142
RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
143143
RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
144-
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8\bin"
144+
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.11\bin"
145145
RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
146146
RUN setx PATH "%PATH%;C:\ZStd"
147147
RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"

‎dev-support/docker/pkg-resolver/install-maven.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ if [ $? -eq 1 ]; then
2727
exit 1
2828
fi
2929

30-
default_version="3.6.3"
30+
default_version="3.9.11"
3131
version_to_install=$default_version
3232
if [ -n "$2" ]; then
3333
version_to_install="$2"
3434
fi
3535

36-
if [ "$version_to_install" != "3.6.3" ]; then
36+
if [ "$version_to_install" != "3.9.11" ]; then
3737
echo "WARN: Don't know how to install version $version_to_install, installing the default version $default_version instead"
3838
version_to_install=$default_version
3939
fi
4040

41-
if [ "$version_to_install" == "3.6.3" ]; then
41+
if [ "$version_to_install" == "3.9.11" ]; then
4242
mkdir -p /opt/maven /tmp/maven &&
43-
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 \
44-
-o /tmp/maven/apache-maven-3.6.3-bin.tar.gz &&
45-
tar xzf /tmp/maven/apache-maven-3.6.3-bin.tar.gz --strip-components 1 -C /opt/maven
43+
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 \
44+
-o /tmp/maven/apache-maven-3.9.11-bin.tar.gz &&
45+
tar xzf /tmp/maven/apache-maven-3.9.11-bin.tar.gz --strip-components 1 -C /opt/maven
4646
else
4747
echo "ERROR: Don't know how to install version $version_to_install"
4848
exit 1

‎dev-support/docker/pkg-resolver/packages.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,32 +258,26 @@
258258
"ubuntu:focal::arch64": "make",
259259
"rockylinux:8": "make"
260260
},
261-
"maven": {
262-
"debian:11": "maven",
263-
"ubuntu:focal": "maven",
264-
"ubuntu:noble": "maven",
265-
"ubuntu:focal::arch64": "maven"
266-
},
267261
"java": {
268262
"debian:11": [
269263
"openjdk-11-jdk",
270264
"openjdk-17-jdk"
271265
],
272266
"ubuntu:focal": [
273-
"temurin-24-jdk",
267+
"temurin-25-jdk",
274268
"openjdk-8-jdk",
275269
"openjdk-11-jdk",
276270
"openjdk-17-jdk",
277271
"openjdk-21-jdk"
278272
],
279273
"ubuntu:noble": [
280-
"temurin-24-jdk",
274+
"temurin-25-jdk",
281275
"openjdk-11-jdk",
282276
"openjdk-17-jdk",
283277
"openjdk-21-jdk"
284278
],
285279
"ubuntu:focal::arch64": [
286-
"temurin-24-jdk",
280+
"temurin-25-jdk",
287281
"openjdk-8-jdk",
288282
"openjdk-11-jdk",
289283
"openjdk-17-jdk",

‎hadoop-assemblies/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<name>Apache Hadoop Assemblies</name>
3232
<description>Apache Hadoop Assemblies</description>
3333

34-
<properties>
35-
<failIfNoTests>false</failIfNoTests>
36-
</properties>
37-
3834
<build>
3935
<plugins>
4036
<plugin>

0 commit comments

Comments
 (0)