Skip to content

Commit 3a1a2eb

Browse files
manika137manika137
committed
Merge branch 'apache:trunk' into HADOOP-19518_wasbScript
2 parents 6512250 + 160b06b commit 3a1a2eb

File tree

707 files changed

+35539
-18377
lines changed

Some content is hidden

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

707 files changed

+35539
-18377
lines changed

‎BUILDING.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Requirements:
66
* Unix System
77
* JDK 1.8
88
* Maven 3.3 or later
9-
* Boost 1.72 (if compiling native code)
9+
* Boost 1.86.0 (if compiling native code)
1010
* Protocol Buffers 3.21.12 (if compiling native code)
1111
* CMake 3.19 or newer (if compiling native code)
1212
* Zlib devel (if compiling native code)
@@ -82,8 +82,8 @@ Refer to dev-support/docker/Dockerfile):
8282
$ make -j$(nproc)
8383
$ sudo make install
8484
* Boost
85-
$ curl -L https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2/download > boost_1_72_0.tar.bz2
86-
$ tar --bzip2 -xf boost_1_72_0.tar.bz2 && cd boost_1_72_0
85+
$ curl -L https://sourceforge.net/projects/boost/files/boost/1.86.0/boost_1_86_0.tar.bz2/download > boost_1_86_0.tar.bz2
86+
$ tar --bzip2 -xf boost_1_86_0.tar.bz2 && cd boost_1_86_0
8787
$ ./bootstrap.sh --prefix=/usr/
8888
$ ./b2 --without-python
8989
$ sudo ./b2 --without-python install
@@ -493,9 +493,9 @@ Building on CentOS 8
493493
$ sudo make install
494494

495495
* Install boost.
496-
$ curl -L -o boost_1_72_0.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2/download
497-
$ tar xjf boost_1_72_0.tar.bz2
498-
$ cd boost_1_72_0
496+
$ curl -L -o boost_1_86_0.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.86.0/boost_1_86_0.tar.bz2/download
497+
$ tar xjf boost_1_86_0.tar.bz2
498+
$ cd boost_1_86_0
499499
$ ./bootstrap.sh --prefix=/usr/local
500500
$ ./b2
501501
$ sudo ./b2 install
@@ -526,7 +526,7 @@ Requirements:
526526
* Windows 10
527527
* JDK 1.8
528528
* Maven 3.0 or later (maven.apache.org)
529-
* Boost 1.72 (boost.org)
529+
* Boost 1.86.0 (boost.org)
530530
* Protocol Buffers 3.21.12 (https://github.com/protocolbuffers/protobuf/tags)
531531
* CMake 3.19 or newer (cmake.org)
532532
* Visual Studio 2019 (visualstudio.com)

‎dev-support/docker/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,14 @@ RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \
4444
######
4545
# hadolint ignore=DL3008,SC2046
4646
RUN apt-get -q update \
47+
&& apt-get -q install -y --no-install-recommends wget apt-transport-https gpg gpg-agent gawk ca-certificates \
4748
&& apt-get -q install -y --no-install-recommends python3 \
49+
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" > /etc/apt/sources.list.d/adoptium.list \
50+
&& wget -q -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/trusted.gpg.d/adoptium.asc \
51+
&& apt-get -q update \
4852
&& apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal) \
4953
&& apt-get clean \
54+
&& update-java-alternatives -s java-1.8.0-openjdk-amd64 \
5055
&& rm -rf /var/lib/apt/lists/*
5156

5257
RUN locale-gen en_US.UTF-8

‎dev-support/docker/Dockerfile_aarch64

+5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,14 @@ RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \
4444
######
4545
# hadolint ignore=DL3008,SC2046
4646
RUN apt-get -q update \
47+
&& apt-get -q install -y --no-install-recommends wget apt-transport-https gpg gpg-agent gawk ca-certificates \
4748
&& apt-get -q install -y --no-install-recommends python3 \
49+
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" > /etc/apt/sources.list.d/adoptium.list \
50+
&& wget -q -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/trusted.gpg.d/adoptium.asc \
51+
&& apt-get -q update \
4852
&& apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal::arch64) \
4953
&& apt-get clean \
54+
&& update-java-alternatives -s java-1.8.0-openjdk-arm64 \
5055
&& rm -rf /var/lib/apt/lists/*
5156

5257
RUN locale-gen en_US.UTF-8

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ if [ $? -eq 1 ]; then
2727
exit 1
2828
fi
2929

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

36-
if [ "$version_to_install" != "1.72.0" ]; then
36+
if [ "$version_to_install" != "1.86.0" ]; 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" == "1.72.0" ]; then
41+
if [ "$version_to_install" == "1.86.0" ]; then
4242
# hadolint ignore=DL3003
4343
mkdir -p /opt/boost-library &&
44-
curl -L https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2/download >boost_1_72_0.tar.bz2 &&
45-
mv boost_1_72_0.tar.bz2 /opt/boost-library &&
44+
curl -L https://sourceforge.net/projects/boost/files/boost/1.86.0/boost_1_86_0.tar.bz2/download >boost_1_86_0.tar.bz2 &&
45+
mv boost_1_86_0.tar.bz2 /opt/boost-library &&
4646
cd /opt/boost-library &&
47-
tar --bzip2 -xf boost_1_72_0.tar.bz2 &&
48-
cd /opt/boost-library/boost_1_72_0 &&
47+
tar --bzip2 -xf boost_1_86_0.tar.bz2 &&
48+
cd /opt/boost-library/boost_1_86_0 &&
4949
./bootstrap.sh --prefix=/usr/ &&
5050
./b2 --without-python install &&
5151
cd /root &&

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

+2
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,13 @@
260260
"java": {
261261
"debian:10": "openjdk-11-jdk",
262262
"ubuntu:focal": [
263+
"temurin-24-jdk",
263264
"openjdk-8-jdk",
264265
"openjdk-11-jdk",
265266
"openjdk-17-jdk"
266267
],
267268
"ubuntu:focal::arch64": [
269+
"temurin-24-jdk",
268270
"openjdk-8-jdk",
269271
"openjdk-11-jdk",
270272
"openjdk-17-jdk"

‎hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,10 @@
125125
<artifactId>hadoop-huaweicloud</artifactId>
126126
<scope>compile</scope>
127127
</dependency>
128+
<dependency>
129+
<groupId>org.apache.hadoop</groupId>
130+
<artifactId>hadoop-tos</artifactId>
131+
<scope>compile</scope>
132+
</dependency>
128133
</dependencies>
129134
</project>

‎hadoop-cloud-storage-project/hadoop-tos/dev-support/findbugs-exclude.xml

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<FindBugsFilter>
18+
<Match>
19+
<Class name="org.apache.hadoop.fs.tosfs.object.ObjectOutputStream"/>
20+
<or>
21+
<Bug pattern="IS2_INCONSISTENT_SYNC" />
22+
<Bug pattern="NP_NULL_ON_SOME_PATH" />
23+
</or>
24+
</Match>
25+
<Match>
26+
<Class name="org.apache.hadoop.fs.tosfs.conf.TosKeys"/>
27+
<Bug pattern="MS_MUTABLE_ARRAY" />
28+
</Match>
29+
<Match>
30+
<Class name="org.apache.hadoop.fs.tosfs.object.Constants"/>
31+
<Bug pattern="MS_MUTABLE_ARRAY" />
32+
</Match>
33+
<Match>
34+
<Class name="org.apache.hadoop.fs.tosfs.RawFileStatus"/>
35+
<or>
36+
<Bug pattern="EI_EXPOSE_REP" />
37+
<Bug pattern="EI_EXPOSE_REP2" />
38+
</or>
39+
</Match>
40+
<Match>
41+
<Class name="org.apache.hadoop.fs.tosfs.TosChecksum"/>
42+
<or>
43+
<Bug pattern="EI_EXPOSE_REP" />
44+
<Bug pattern="EI_EXPOSE_REP2" />
45+
</or>
46+
</Match>
47+
<Match>
48+
<Class name="org.apache.hadoop.fs.tosfs.object.ObjectContent"/>
49+
<or>
50+
<Bug pattern="EI_EXPOSE_REP" />
51+
<Bug pattern="EI_EXPOSE_REP2" />
52+
</or>
53+
</Match>
54+
<Match>
55+
<Class name="org.apache.hadoop.fs.tosfs.object.ObjectInfo"/>
56+
<or>
57+
<Bug pattern="EI_EXPOSE_REP" />
58+
<Bug pattern="EI_EXPOSE_REP2" />
59+
</or>
60+
</Match>
61+
<Match>
62+
<Class name="org.apache.hadoop.fs.tosfs.object.ObjectMultiRangeInputStream"/>
63+
<or>
64+
<Bug pattern="EI_EXPOSE_REP" />
65+
<Bug pattern="EI_EXPOSE_REP2" />
66+
</or>
67+
</Match>
68+
<Match>
69+
<Class name="org.apache.hadoop.fs.tosfs.object.ObjectRangeInputStream"/>
70+
<or>
71+
<Bug pattern="EI_EXPOSE_REP" />
72+
<Bug pattern="EI_EXPOSE_REP2" />
73+
</or>
74+
</Match>
75+
<Match>
76+
<Class name="org.apache.hadoop.fs.tosfs.object.tos.GetObjectOutput"/>
77+
<or>
78+
<Bug pattern="EI_EXPOSE_REP" />
79+
<Bug pattern="EI_EXPOSE_REP2" />
80+
</or>
81+
</Match>
82+
<Match>
83+
<Class name="org.apache.hadoop.fs.tosfs.object.tos.ChainTOSInputStream"/>
84+
<Bug pattern="EI_EXPOSE_REP" />
85+
</Match>
86+
<Match>
87+
<Bug pattern="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" />
88+
</Match>
89+
</FindBugsFilter>

0 commit comments

Comments
 (0)