Skip to content

Commit 207b949

Browse files
committed
HADOOP-17679. Upgrade Protobuf to 3.17.3
Change-Id: I9f1918d9eec1736a8ddbd64ed0df6d5f1d28c4cd
1 parent 1d808f5 commit 207b949

7 files changed

Lines changed: 21 additions & 21 deletions

File tree

BUILDING.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Requirements:
77
* JDK 1.8
88
* Maven 3.3 or later
99
* Boost 1.72 (if compiling native code)
10-
* Protocol Buffers 3.7.1 (if compiling native code)
10+
* Protocol Buffers 3.17.3 (if compiling native code)
1111
* CMake 3.19 or newer (if compiling native code)
1212
* Zlib devel (if compiling native code)
1313
* Cyrus SASL devel (if compiling native code)
@@ -74,10 +74,10 @@ Refer to dev-support/docker/Dockerfile):
7474
$ ./bootstrap
7575
$ make -j$(nproc)
7676
$ sudo make install
77-
* Protocol Buffers 3.7.1 (required to build native code)
78-
$ curl -L -s -S https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz -o protobuf-3.7.1.tar.gz
79-
$ mkdir protobuf-3.7-src
80-
$ tar xzf protobuf-3.7.1.tar.gz --strip-components 1 -C protobuf-3.7-src && cd protobuf-3.7-src
77+
* Protocol Buffers 3.17.3 (required to build native code)
78+
$ curl -L -s -S https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-java-3.17.3.tar.gz -o protobuf-3.17.3.tar.gz
79+
$ mkdir protobuf-3.17-src
80+
$ tar xzf protobuf-3.17.3.tar.gz --strip-components 1 -C protobuf-3.17-src && cd protobuf-3.17-src
8181
$ ./configure
8282
$ make -j$(nproc)
8383
$ sudo make install
@@ -408,10 +408,10 @@ Installing required dependencies for clean install of macOS 10.14:
408408
* Install native libraries, only openssl is required to compile native code,
409409
you may optionally install zlib, lz4, etc.
410410
$ brew install openssl
411-
* Protocol Buffers 3.7.1 (required to compile native code)
412-
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz
413-
$ mkdir -p protobuf-3.7 && tar zxvf protobuf-java-3.7.1.tar.gz --strip-components 1 -C protobuf-3.7
414-
$ cd protobuf-3.7
411+
* Protocol Buffers 3.17.3 (required to compile native code)
412+
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-java-3.17.3.tar.gz
413+
$ mkdir -p protobuf-3.17 && tar zxvf protobuf-java-3.17.3.tar.gz --strip-components 1 -C protobuf-3.17
414+
$ cd protobuf-3.17
415415
$ ./configure
416416
$ make
417417
$ make check
@@ -447,10 +447,10 @@ Building on CentOS 8
447447
* Install python2 for building documentation.
448448
$ sudo dnf install python2
449449

450-
* Install Protocol Buffers v3.7.1.
450+
* Install Protocol Buffers v3.17.3.
451451
$ git clone https://github.com/protocolbuffers/protobuf
452452
$ cd protobuf
453-
$ git checkout v3.7.1
453+
$ git checkout v3.17.3
454454
$ autoreconf -i
455455
$ ./configure --prefix=/usr/local
456456
$ make
@@ -506,7 +506,7 @@ Requirements:
506506
* JDK 1.8
507507
* Maven 3.0 or later
508508
* Boost 1.72
509-
* Protocol Buffers 3.7.1
509+
* Protocol Buffers 3.17.3
510510
* CMake 3.19 or newer
511511
* Visual Studio 2010 Professional or Higher
512512
* Windows SDK 8.1 (if building CPU rate control for the container executor)

LICENSE-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
381381
leveldb v1.13
382382

383383
com.google.protobuf:protobuf-java:2.5.0
384-
com.google.protobuf:protobuf-java:3.6.1
384+
com.google.protobuf:protobuf-java:3.17.3
385385
com.google.re2j:re2j:1.1
386386
com.jcraft:jsch:0.1.54
387387
com.thoughtworks.paranamer:paranamer:2.3

dev-support/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
6666
ENV SPOTBUGS_HOME /opt/spotbugs
6767

6868
#######
69-
# Set env vars for Google Protobuf 3.7.1
69+
# Set env vars for Google Protobuf 3.17.3
7070
#######
7171
ENV PROTOBUF_HOME /opt/protobuf
7272
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
6666
ENV SPOTBUGS_HOME /opt/spotbugs
6767

6868
#######
69-
# Set env vars for Google Protobuf 3.7.1
69+
# Set env vars for Google Protobuf 3.17.3
7070
#######
7171
ENV PROTOBUF_HOME /opt/protobuf
7272
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_debian_10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
6969
ENV SPOTBUGS_HOME /opt/spotbugs
7070

7171
#######
72-
# Set env vars for Google Protobuf 3.7.1
72+
# Set env vars for Google Protobuf 3.17.3
7373
#######
7474
ENV PROTOBUF_HOME /opt/protobuf
7575
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/pkg-resolver/install-protobuf.sh

Lines changed: 4 additions & 4 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.7.1"
30+
default_version="3.17.3"
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.7.1" ]; then
36+
if [ "$version_to_install" != "3.17.3" ]; 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.7.1" ]; then
41+
if [ "$version_to_install" == "3.17.3" ]; then
4242
# hadolint ignore=DL3003
4343
mkdir -p /opt/protobuf-src &&
4444
curl -L -s -S \
45-
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
45+
https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-java-3.17.3.tar.gz \
4646
-o /opt/protobuf.tar.gz &&
4747
tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src &&
4848
cd /opt/protobuf-src &&

hadoop-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<!--Protobuf version for backward compatibility-->
8888
<protobuf.version>2.5.0</protobuf.version>
8989
<!-- ProtocolBuffer version, actually used in Hadoop -->
90-
<hadoop.protobuf.version>3.7.1</hadoop.protobuf.version>
90+
<hadoop.protobuf.version>3.17.3</hadoop.protobuf.version>
9191
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
9292

9393
<hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>

0 commit comments

Comments
 (0)