Skip to content

Commit 4e7e354

Browse files
KeeProMiseKeeProMise
committed
Merge remote-tracking branch 'upstream/HDFS-17531' into HDFS-17545-4
# Conflicts: # hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/AsyncRpcProtocolPBUtil.java # hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/async/AsyncUtil.java # hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/protocolPB/TestAsyncRpcProtocolPBUtil.java # hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/protocolPB/TestRouterClientSideTranslatorPB.java
2 parents 0521134 + a591902 commit 4e7e354

File tree

525 files changed

+19703
-3321
lines changed

Some content is hidden

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

525 files changed

+19703
-3321
lines changed

‎LICENSE-binary‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,26 +229,26 @@ 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:guice:4.0
233-
com.google:guice-servlet:4.0
232+
com.google:guice:5.1.0
233+
com.google:guice-servlet:5.1.0
234234
com.google.api.grpc:proto-google-common-protos:1.0.0
235235
com.google.code.gson:2.9.0
236-
com.google.errorprone:error_prone_annotations:2.2.0
237-
com.google.j2objc:j2objc-annotations:1.1
236+
com.google.errorprone:error_prone_annotations:2.5.1
237+
com.google.j2objc:j2objc-annotations:1.3
238238
com.google.json-simple:json-simple:1.1.1
239239
com.google.guava:failureaccess:1.0
240240
com.google.guava:guava:20.0
241-
com.google.guava:guava:27.0-jre
241+
com.google.guava:guava:32.0.1-jre
242242
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
243243
com.microsoft.azure:azure-storage:7.0.0
244244
com.nimbusds:nimbus-jose-jwt:9.37.2
245245
com.zaxxer:HikariCP:4.0.3
246246
commons-beanutils:commons-beanutils:1.9.4
247247
commons-cli:commons-cli:1.5.0
248-
commons-codec:commons-codec:1.11
248+
commons-codec:commons-codec:1.15
249249
commons-collections:commons-collections:3.2.2
250250
commons-daemon:commons-daemon:1.0.13
251-
commons-io:commons-io:2.14.0
251+
commons-io:commons-io:2.16.1
252252
commons-net:commons-net:3.9.0
253253
de.ruedigermoeller:fst:2.50
254254
io.grpc:grpc-api:1.53.0
@@ -298,6 +298,7 @@ javax.inject:javax.inject:1
298298
net.java.dev.jna:jna:5.2.0
299299
net.minidev:accessors-smart:1.2
300300
org.apache.avro:avro:1.9.2
301+
org.apache.avro:avro:1.11.3
301302
org.apache.commons:commons-collections4:4.2
302303
org.apache.commons:commons-compress:1.26.1
303304
org.apache.commons:commons-configuration2:2.10.1
@@ -361,8 +362,8 @@ org.lz4:lz4-java:1.7.1
361362
org.objenesis:objenesis:2.6
362363
org.xerial.snappy:snappy-java:1.1.10.4
363364
org.yaml:snakeyaml:2.0
364-
org.wildfly.openssl:wildfly-openssl:1.1.3.Final
365-
software.amazon.awssdk:bundle:jar:2.24.6
365+
org.wildfly.openssl:wildfly-openssl:2.1.4.Final
366+
software.amazon.awssdk:bundle:2.25.53
366367

367368

368369
--------------------------------------------------------------------------------
@@ -379,7 +380,7 @@ hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree
379380
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/{fstatat|openat|unlinkat}.h
380381

381382
com.github.luben:zstd-jni:1.5.2-1
382-
dnsjava:dnsjava:2.1.7
383+
dnsjava:dnsjava:3.6.1
383384
org.codehaus.woodstox:stax2-api:4.2.1
384385

385386

@@ -395,7 +396,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
395396
leveldb v1.13
396397

397398
com.google.protobuf:protobuf-java:2.5.0
398-
com.google.protobuf:protobuf-java:3.21.12
399+
com.google.protobuf:protobuf-java:3.25.3
399400
com.google.re2j:re2j:1.1
400401
com.jcraft:jsch:0.1.55
401402
com.thoughtworks.paranamer:paranamer:2.3
@@ -485,7 +486,7 @@ com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
485486
org.bouncycastle:bcpkix-jdk18on:1.78.1
486487
org.bouncycastle:bcprov-jdk18on:1.78.1
487488
org.bouncycastle:bcutil-jdk18on:1.78.1
488-
org.checkerframework:checker-qual:2.5.2
489+
org.checkerframework:checker-qual:3.8.0
489490
org.codehaus.mojo:animal-sniffer-annotations:1.21
490491
org.jruby.jcodings:jcodings:1.0.13
491492
org.jruby.joni:joni:2.1.2

‎dev-support/bin/create-release‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ function set_defaults
205205
DOCKERRAN=false
206206

207207
CPU_ARCH=$(echo "$MACHTYPE" | cut -d- -f1)
208-
if [ "$CPU_ARCH" = "aarch64" ]; then
208+
if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
209209
DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_aarch64"
210210
fi
211211

@@ -514,7 +514,7 @@ function dockermode
514514

515515
# we always force build with the OpenJDK JDK
516516
# but with the correct version
517-
if [ "$CPU_ARCH" = "aarch64" ]; then
517+
if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
518518
echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-arm64"
519519
else
520520
echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-amd64"

‎dev-support/docker/Dockerfile_centos_7‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ COPY pkg-resolver pkg-resolver
3030
RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \
3131
&& chmod a+r pkg-resolver/*.json
3232

33+
######
34+
# Centos 7 has reached its EOL and the packages
35+
# are no longer available on mirror.centos.org site.
36+
# Please see https://www.centos.org/centos-linux-eol/
37+
######
38+
RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7
39+
3340
######
3441
# Install packages from yum
3542
######
@@ -38,8 +45,13 @@ RUN yum update -y \
3845
&& yum groupinstall -y "Development Tools" \
3946
&& yum install -y \
4047
centos-release-scl \
41-
python3 \
42-
&& yum install -y $(pkg-resolver/resolve.py centos:7)
48+
python3
49+
50+
# Apply the script again because centos-release-scl creates new YUM repo files
51+
RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7
52+
53+
# hadolint ignore=DL3008,SC2046
54+
RUN yum install -y $(pkg-resolver/resolve.py centos:7)
4355

4456
# Set GCC 9 as the default C/C++ compiler
4557
RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fi
4040

4141
if [ "$version_to_install" == "1.2.0-4" ]; then
4242
mkdir -p /tmp/yasm &&
43-
curl -L -s -S https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/y/yasm-1.2.0-4.el7.x86_64.rpm \
43+
curl -L -s -S https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/y/yasm-1.2.0-4.el7.x86_64.rpm \
4444
-o /tmp/yasm-1.2.0-4.el7.x86_64.rpm &&
4545
rpm -Uvh /tmp/yasm-1.2.0-4.el7.x86_64.rpm
4646
else

‎dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
if [ "$1" == "centos:7" ] || [ "$1" == "centos:8" ]; then
2525
cd /etc/yum.repos.d/ || exit &&
2626
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* &&
27-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* &&
27+
sed -i 's|# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* &&
2828
yum update -y &&
2929
cd /root || exit
3030
else

‎hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ allowed_expr+="|^[^-]*-default.xml$"
5151
allowed_expr+="|^[^-]*-version-info.properties$"
5252
# * Hadoop's application classloader properties file.
5353
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
54+
# Comes from dnsjava, not sure if relocatable.
55+
allowed_expr+="|^messages.properties$"
5456
# public suffix list used by httpcomponents
5557
allowed_expr+="|^mozilla/$"
5658
allowed_expr+="|^mozilla/public-suffix-list.txt$"

‎hadoop-client-modules/hadoop-client-runtime/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@
229229
<exclude>jnamed*</exclude>
230230
<exclude>lookup*</exclude>
231231
<exclude>update*</exclude>
232+
<exclude>META-INF/versions/21/*</exclude>
233+
<exclude>META-INF/versions/21/**/*</exclude>
232234
</excludes>
233235
</filter>
234236
<filter>
@@ -243,6 +245,7 @@
243245
<excludes>
244246
<exclude>META-INF/versions/9/module-info.class</exclude>
245247
<exclude>META-INF/versions/11/module-info.class</exclude>
248+
<exclude>META-INF/versions/21/module-info.class</exclude>
246249
</excludes>
247250
</filter>
248251

‎hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,4 +454,10 @@
454454
<Class name="org.apache.hadoop.ipc.internal.ShadedProtobufHelper" />
455455
<Bug pattern="AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION" />
456456
</Match>
457+
458+
<!-- class cast after an assignableFrom check. -->
459+
<Match>
460+
<Class name="org.apache.hadoop.util.dynamic.DynMethods" />
461+
<Bug pattern="BC_UNCONFIRMED_CAST" />
462+
</Match>
457463
</FindBugsFilter>

‎hadoop-common-project/hadoop-common/pom.xml‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependencies>
4141
<dependency>
4242
<groupId>org.apache.hadoop.thirdparty</groupId>
43-
<artifactId>hadoop-shaded-protobuf_3_23</artifactId>
43+
<artifactId>hadoop-shaded-protobuf_3_25</artifactId>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.hadoop</groupId>
@@ -330,25 +330,6 @@
330330
<dependency>
331331
<groupId>org.apache.zookeeper</groupId>
332332
<artifactId>zookeeper</artifactId>
333-
<exclusions>
334-
<exclusion>
335-
<groupId>org.jboss.netty</groupId>
336-
<artifactId>netty</artifactId>
337-
</exclusion>
338-
<exclusion>
339-
<!-- otherwise seems to drag in junit 3.8.1 via jline -->
340-
<groupId>junit</groupId>
341-
<artifactId>junit</artifactId>
342-
</exclusion>
343-
<exclusion>
344-
<groupId>com.sun.jdmk</groupId>
345-
<artifactId>jmxtools</artifactId>
346-
</exclusion>
347-
<exclusion>
348-
<groupId>com.sun.jmx</groupId>
349-
<artifactId>jmxri</artifactId>
350-
</exclusion>
351-
</exclusions>
352333
</dependency>
353334
<dependency>
354335
<groupId>io.netty</groupId>
@@ -708,6 +689,17 @@
708689
</filesets>
709690
</configuration>
710691
</plugin>
692+
693+
<plugin>
694+
<groupId>org.apache.maven.plugins</groupId>
695+
<artifactId>maven-javadoc-plugin</artifactId>
696+
<configuration>
697+
<sourceFileExcludes>
698+
<sourceFileExclude>**/FSProtos.java</sourceFileExclude>
699+
</sourceFileExcludes>
700+
<excludePackageNames>*.proto:*.tracing:*.protobuf</excludePackageNames>
701+
</configuration>
702+
</plugin>
711703
</plugins>
712704
</build>
713705

@@ -1279,16 +1271,6 @@
12791271
</execution>
12801272
</executions>
12811273
</plugin>
1282-
<plugin>
1283-
<groupId>org.apache.maven.plugins</groupId>
1284-
<artifactId>maven-javadoc-plugin</artifactId>
1285-
<configuration>
1286-
<sourceFileExcludes>
1287-
<sourceFileExclude>**/FSProtos.java</sourceFileExclude>
1288-
</sourceFileExcludes>
1289-
<excludePackageNames>*.proto:*.tracing:*.protobuf</excludePackageNames>
1290-
</configuration>
1291-
</plugin>
12921274
</plugins>
12931275
</build>
12941276
</profile>

0 commit comments

Comments
 (0)