Skip to content

Commit 8fee308

Browse files
authored
Merge branch 'apache:trunk' into HADOOP-19663
2 parents d4a02dc + 5f36943 commit 8fee308

File tree

531 files changed

+29715
-7303
lines changed

Some content is hidden

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

531 files changed

+29715
-7303
lines changed

.github/workflows/stale.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Close stale PRs
21+
on:
22+
schedule:
23+
- cron: "0 0 * * *"
24+
25+
jobs:
26+
stale:
27+
if: github.repository == 'apache/hadoop'
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/stale@v1
31+
with:
32+
repo-token: ${{ secrets.GITHUB_TOKEN }}
33+
stale-pr-message: >
34+
We're closing this stale PR because it has been open for 100 days with
35+
no activity. This isn't a judgement on the merit of the PR in any way.
36+
It's just a way of keeping the PR queue manageable.
37+
38+
If you feel like this was a mistake, or you would like to continue
39+
working on it, please feel free to re-open it and ask for a committer to
40+
remove the stale tag and review again.
41+
42+
Thanks all for your contribution.
43+
days-before-stale: 100
44+
days-before-close: 0
45+
close-pr-label: 'stale'

BUILDING.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ On Linux / Mac:
3131

3232
$ ./start-build-env.sh [OS platform]
3333

34-
- [OS Platform] One of [centos_7, centos_8, debian_10, ubuntu_20, ubuntu_24, windows_10].
34+
- [OS Platform] One of [rockylinux_8, debian_11, ubuntu_20, ubuntu_24, windows_10].
3535
Default is 'ubuntu_20'.
3636
Note: Currently only default ('ubuntu_20') is supported on arm machine
3737

@@ -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

@@ -461,7 +460,7 @@ path. This is necessary at least for Homebrewed OpenSSL.
461460

462461
----------------------------------------------------------------------------------
463462

464-
Building on CentOS 8
463+
Building on Rocky Linux 8
465464

466465
----------------------------------------------------------------------------------
467466

@@ -482,7 +481,7 @@ Building on CentOS 8
482481
$ sudo make install
483482
$ cd ..
484483

485-
* Install libraries provided by CentOS 8.
484+
* Install libraries provided by Rocky Linux 8.
486485
$ sudo dnf install libtirpc-devel zlib-devel lz4-devel bzip2-devel openssl-devel cyrus-sasl-devel libpmem-devel
487486

488487
* Install GCC 9.3.0
@@ -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: 96 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,25 @@ com.fasterxml.woodstox:woodstox-core:5.4.0
229229
com.github.ben-manes.caffeine:caffeine:2.9.3
230230
com.github.davidmoten:rxjava-extras:0.8.0.17
231231
com.github.stephenc.jcip:jcip-annotations:1.0-1
232+
com.google.api:api-common:2.47.2
233+
com.google.api-client:google-api-client:2.7.2
234+
com.google.api:gax:2.64.2
235+
com.google.api:gax-grpc:2.64.2
236+
com.google.api:gax-httpjson:2.64.2
237+
com.google.api.grpc:gapic-google-cloud-storage-v2:2.52.0
238+
com.google.api.grpc:grpc-google-cloud-storage-v2:2.52.0
239+
com.google.api.grpc:proto-google-cloud-monitoring-v3:3.52.0
240+
com.google.api.grpc:proto-google-cloud-storage-v2:2.52.0
241+
com.google.api.grpc:proto-google-common-protos:2.55.2
242+
com.google.api.grpc:proto-google-iam-v1:1.50.2
243+
com.google.apis:google-api-services-storage:v1-rev20250420-2.0.0
244+
com.google.auto.value:auto-value-annotations:1.11.0
245+
com.google.cloud:google-cloud-core-grpc:2.54.2
246+
com.google.cloud:google-cloud-core-http:2.54.2
247+
com.google.cloud:google-cloud-core:2.54.2
248+
com.google.cloud:google-cloud-monitoring:3.52.0
249+
com.google.cloud.opentelemetry:exporter-metrics:0.33.0
250+
com.google.errorprone:error_prone_annotations:2.36.0
232251
com.google:guice:5.1.0
233252
com.google:guice-servlet:5.1.0
234253
com.google.api.grpc:proto-google-common-protos:1.0.0
@@ -237,11 +256,20 @@ com.google.errorprone:error_prone_annotations:2.5.1
237256
com.google.j2objc:j2objc-annotations:1.3
238257
com.google.json-simple:json-simple:1.1.1
239258
com.google.guava:failureaccess:1.0
259+
com.google.guava:failureaccess:1.0.2
240260
com.google.guava:guava:20.0
241261
com.google.guava:guava:32.0.1-jre
262+
com.google.guava:guava:33.1.0-jre
242263
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
264+
com.google.http-client:google-http-client-apache-v2:1.46.3
265+
com.google.http-client:google-http-client-appengine:1.46.3
266+
com.google.http-client:google-http-client-gson:1.46.3
267+
com.google.http-client:google-http-client-jackson2:1.46.3
268+
com.google.http-client:google-http-client:1.46.3
269+
com.google.j2objc:j2objc-annotations:3.0.0
270+
com.google.oauth-client:google-oauth-client:1.37.0
243271
com.microsoft.azure:azure-storage:7.0.0
244-
com.nimbusds:nimbus-jose-jwt:9.37.2
272+
com.nimbusds:nimbus-jose-jwt:10.4
245273
com.zaxxer:HikariCP:4.0.3
246274
commons-beanutils:commons-beanutils:1.9.4
247275
commons-cli:commons-cli:1.9.0
@@ -251,45 +279,73 @@ commons-daemon:commons-daemon:1.0.13
251279
commons-io:commons-io:2.16.1
252280
commons-net:commons-net:3.9.0
253281
de.ruedigermoeller:fst:2.50
282+
io.grpc:grpc-alts:1.70.0
254283
io.grpc:grpc-api:1.69.0
284+
io.grpc:grpc-api:1.70.0
285+
io.grpc:grpc-auth:1.70.0
255286
io.grpc:grpc-context:1.69.0
287+
io.grpc:grpc-context:1.70.0
256288
io.grpc:grpc-core:1.69.0
289+
io.grpc:grpc-core:1.70.0
290+
io.grpc:grpc-googleapis:1.70.0
291+
io.grpc:grpc-grpclb:1.70.0
292+
io.grpc:grpc-inprocess:1.70.0
257293
io.grpc:grpc-netty:1.69.0
294+
io.grpc:grpc-netty-shaded:1.70.0
295+
io.grpc:grpc-opentelemetry:1.70.0
258296
io.grpc:grpc-protobuf:1.69.0
297+
io.grpc:grpc-protobuf:1.70.0
259298
io.grpc:grpc-protobuf-lite:1.69.0
299+
io.grpc:grpc-rls:1.70.0
300+
io.grpc:grpc-services:1.70.0
260301
io.grpc:grpc-stub:1.69.0
261-
io.netty:netty-all:4.1.118.Final
262-
io.netty:netty-buffer:4.1.118.Final
263-
io.netty:netty-codec:4.1.118.Final
264-
io.netty:netty-codec-dns:4.1.118.Final
265-
io.netty:netty-codec-haproxy:4.1.118.Final
266-
io.netty:netty-codec-http:4.1.118.Final
267-
io.netty:netty-codec-http2:4.1.118.Final
268-
io.netty:netty-codec-memcache:4.1.118.Final
269-
io.netty:netty-codec-mqtt:4.1.118.Final
270-
io.netty:netty-codec-redis:4.1.118.Final
271-
io.netty:netty-codec-smtp:4.1.118.Final
272-
io.netty:netty-codec-socks:4.1.118.Final
273-
io.netty:netty-codec-stomp:4.1.118.Final
274-
io.netty:netty-codec-xml:4.1.118.Final
275-
io.netty:netty-common:4.1.118.Final
276-
io.netty:netty-handler:4.1.118.Final
277-
io.netty:netty-handler-proxy:4.1.118.Final
278-
io.netty:netty-resolver:4.1.118.Final
279-
io.netty:netty-resolver-dns:4.1.118.Final
280-
io.netty:netty-transport:4.1.118.Final
281-
io.netty:netty-transport-rxtx:4.1.118.Final
282-
io.netty:netty-transport-sctp:4.1.118.Final
283-
io.netty:netty-transport-udt:4.1.118.Final
284-
io.netty:netty-transport-classes-epoll:4.1.118.Final
285-
io.netty:netty-transport-native-unix-common:4.1.118.Final
286-
io.netty:netty-transport-classes-kqueue:4.1.118.Final
287-
io.netty:netty-resolver-dns-classes-macos:4.1.118.Final
288-
io.netty:netty-transport-native-epoll:4.1.118.Final
289-
io.netty:netty-transport-native-kqueue:4.1.118.Final
290-
io.netty:netty-resolver-dns-native-macos:4.1.118.Final
302+
io.grpc:grpc-stub:1.70.0
303+
io.grpc:grpc-util:1.70.0
304+
io.grpc:grpc-xds:1.70.0
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
291335
io.opencensus:opencensus-api:0.12.3
336+
io.opencensus:opencensus-api:0.31.1
292337
io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
338+
io.opencensus:opencensus-contrib-http-util:0.31.1
339+
io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha
340+
io.opentelemetry:opentelemetry-api:1.47.0
341+
io.opentelemetry:opentelemetry-context:1.47.0
342+
io.opentelemetry:opentelemetry-sdk-common:1.47.0
343+
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.47.0
344+
io.opentelemetry:opentelemetry-sdk:1.47.0
345+
io.opentelemetry:opentelemetry-sdk-logs:1.47.0
346+
io.opentelemetry:opentelemetry-sdk-metrics:1.47.0
347+
io.opentelemetry:opentelemetry-sdk-trace:1.47.0
348+
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha
293349
io.reactivex:rxjava:1.3.8
294350
io.reactivex:rxjava-string:1.1.1
295351
io.reactivex:rxnetty:0.4.20
@@ -302,9 +358,9 @@ org.apache.commons:commons-compress:1.26.1
302358
org.apache.commons:commons-configuration2:2.10.1
303359
org.apache.commons:commons-csv:1.9.0
304360
org.apache.commons:commons-digester:1.8.1
305-
org.apache.commons:commons-lang3:3.17.0
361+
org.apache.commons:commons-lang3:3.18.0
306362
org.apache.commons:commons-math3:3.6.1
307-
org.apache.commons:commons-text:1.10.0
363+
org.apache.commons:commons-text:1.14.0
308364
org.apache.commons:commons-validator:1.6
309365
org.apache.curator:curator-client:5.2.0
310366
org.apache.curator:curator-framework:5.2.0
@@ -340,6 +396,7 @@ org.apache.solr:solr-solrj:8.11.2
340396
org.apache.yetus:audience-annotations:0.5.0
341397
org.apache.zookeeper:zookeeper:3.8.4
342398
org.codehaus.jettison:jettison:1.5.4
399+
org.conscrypt:conscrypt-openjdk-uber:2.5.2
343400
org.eclipse.jetty:jetty-annotations:9.4.57.v20241219
344401
org.eclipse.jetty:jetty-http:9.4.57.v20241219
345402
org.eclipse.jetty:jetty-io:9.4.57.v20241219
@@ -363,6 +420,7 @@ org.yaml:snakeyaml:2.0
363420
org.wildfly.openssl:wildfly-openssl:2.1.4.Final
364421
ro.isdc.wro4j:wro4j-maven-plugin:1.8.0
365422
software.amazon.awssdk:bundle:2.29.52
423+
software.amazon.s3.analyticsaccelerator:analyticsaccelerator-s3:1.3.0
366424
net.jodah:failsafe:2.4.4
367425

368426
--------------------------------------------------------------------------------
@@ -394,18 +452,22 @@ hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
394452
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
395453
leveldb v1.13
396454

455+
com.google.auth:google-auth-library-credentials:1.33.1
456+
com.google.auth:google-auth-library-oauth2-http:1.33.1
397457
com.google.protobuf:protobuf-java:2.5.0
398458
com.google.protobuf:protobuf-java:3.25.5
399459
com.google.re2j:re2j:1.1
400460
com.jcraft:jsch:0.1.55
401461
com.thoughtworks.paranamer:paranamer:2.3
402462
jakarta.activation:jakarta.activation-api:1.2.1
463+
org.checkerframework:checker-qual:3.49.0
403464
org.fusesource.leveldbjni:leveldbjni-all:1.8
404465
org.jline:jline:3.9.0
405466
org.hamcrest:hamcrest-core:1.3
406467
org.ow2.asm:asm:5.0.4
407468
org.ow2.asm:asm-commons:6.0
408469
org.ow2.asm:asm-tree:6.0
470+
org.threeten:threetenbp:1.7.0
409471

410472

411473
MIT License
@@ -510,6 +572,7 @@ Eclipse Distribution License (EDL) 1.0
510572
--------------------------
511573

512574
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
575+
org.glassfish.jaxb:jaxb-runtime:2.3.9
513576

514577
Eclipse Public License 1.0
515578
--------------------------

dev-support/Jenkinsfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ pipeline {
8484
stage ('setup sources') {
8585
steps {
8686

87-
dir("${WORKSPACE}/centos-8") {
87+
dir("${WORKSPACE}/rockylinux-8") {
8888
sh '''#!/usr/bin/env bash
8989
90-
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/centos-8
90+
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/rockylinux-8
9191
'''
9292
}
9393

94-
dir("${WORKSPACE}/debian-10") {
94+
dir("${WORKSPACE}/debian-11") {
9595
sh '''#!/usr/bin/env bash
9696
97-
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/debian-10
97+
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/debian-11
9898
'''
9999
}
100100

@@ -111,12 +111,12 @@ pipeline {
111111
// C++/C++ build/platform.
112112
// This stage serves as a means of cross platform validation, which is
113113
// really needed to ensure that any C++ related/platform change doesn't
114-
// break the Hadoop build on Centos 8.
115-
stage ('precommit-run Centos 8') {
114+
// break the Hadoop build on Rocky Linux 8.
115+
stage ('precommit-run Rocky Linux 8') {
116116
environment {
117-
SOURCEDIR = "${WORKSPACE}/centos-8/src"
118-
PATCHDIR = "${WORKSPACE}/centos-8/out"
119-
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_centos_8"
117+
SOURCEDIR = "${WORKSPACE}/rockylinux-8/src"
118+
PATCHDIR = "${WORKSPACE}/rockylinux-8/out"
119+
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_rockylinux_8"
120120
IS_OPTIONAL = 1
121121
}
122122

@@ -136,7 +136,7 @@ pipeline {
136136
failure {
137137
sh '''#!/usr/bin/env bash
138138
139-
cp -Rp "${WORKSPACE}/centos-8/out" "${WORKSPACE}"
139+
cp -Rp "${WORKSPACE}/rockylinux-8/out" "${WORKSPACE}"
140140
'''
141141
archiveArtifacts "out/**"
142142
}
@@ -157,12 +157,12 @@ pipeline {
157157
// C++/C++ build/platform.
158158
// This stage serves as a means of cross platform validation, which is
159159
// really needed to ensure that any C++ related/platform change doesn't
160-
// break the Hadoop build on Debian 10.
161-
stage ('precommit-run Debian 10') {
160+
// break the Hadoop build on Debian 11.
161+
stage ('precommit-run Debian 11') {
162162
environment {
163-
SOURCEDIR = "${WORKSPACE}/debian-10/src"
164-
PATCHDIR = "${WORKSPACE}/debian-10/out"
165-
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_debian_10"
163+
SOURCEDIR = "${WORKSPACE}/debian-11/src"
164+
PATCHDIR = "${WORKSPACE}/debian-11/out"
165+
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_debian_11"
166166
IS_OPTIONAL = 1
167167
}
168168

@@ -182,7 +182,7 @@ pipeline {
182182
failure {
183183
sh '''#!/usr/bin/env bash
184184
185-
cp -Rp "${WORKSPACE}/debian-10/out" "${WORKSPACE}"
185+
cp -Rp "${WORKSPACE}/debian-11/out" "${WORKSPACE}"
186186
'''
187187
archiveArtifacts "out/**"
188188
}

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

0 commit comments

Comments
 (0)