Skip to content

Commit 0e026cb

Browse files
authored
HADOOP-16620. [pb-upgrade] Remove protocol buffers 3.7.1 from requirements in BUILDING.txt (#1558)
* Removed protobuf 3.7.1 from Dockerfile
1 parent c5665b2 commit 0e026cb

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

BUILDING.txt

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Requirements:
66
* Unix System
77
* JDK 1.8
88
* Maven 3.3 or later
9-
* ProtocolBuffer 3.7.1
109
* CMake 3.1 or newer (if compiling native code)
1110
* Zlib devel (if compiling native code)
1211
* Cyrus SASL devel (if compiling native code)
@@ -62,16 +61,6 @@ Installing required packages for clean install of Ubuntu 14.04 LTS Desktop:
6261
$ sudo apt-get -y install maven
6362
* Native libraries
6463
$ sudo apt-get -y install build-essential autoconf automake libtool cmake zlib1g-dev pkg-config libssl-dev libsasl2-dev
65-
* ProtocolBuffer 3.7.1 (required)
66-
$ mkdir -p /opt/protobuf-3.7-src \
67-
&& curl -L -s -S \
68-
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
69-
-o /opt/protobuf-3.7.1.tar.gz \
70-
&& tar xzf /opt/protobuf-3.7.1.tar.gz --strip-components 1 -C /opt/protobuf-3.7-src \
71-
&& cd /opt/protobuf-3.7-src \
72-
&& ./configure\
73-
&& make install \
74-
&& rm -rf /opt/protobuf-3.7-src
7564

7665
Optional packages:
7766

@@ -310,16 +299,6 @@ level once; and then work from the submodule. Keep in mind that SNAPSHOTs
310299
time out after a while, using the Maven '-nsu' will stop Maven from trying
311300
to update SNAPSHOTs from external repos.
312301

313-
----------------------------------------------------------------------------------
314-
Protocol Buffer compiler
315-
316-
The version of Protocol Buffer compiler, protoc, must match the version of the
317-
protobuf JAR.
318-
319-
If you have multiple versions of protoc in your system, you can set in your
320-
build shell the HADOOP_PROTOC_PATH environment variable to point to the one you
321-
want to use for the Hadoop build. If you don't define this environment variable,
322-
protoc is looked up in the PATH.
323302
----------------------------------------------------------------------------------
324303
Importing projects to eclipse
325304

@@ -405,15 +384,6 @@ Installing required dependencies for clean install of macOS 10.14:
405384
* Install native libraries, only openssl is required to compile native code,
406385
you may optionally install zlib, lz4, etc.
407386
$ brew install openssl
408-
* Protocol Buffers 3.7.1 (required)
409-
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz
410-
$ mkdir -p protobuf-3.7 && tar zxvf protobuf-java-3.7.1.tar.gz --strip-components 1 -C protobuf-3.7
411-
$ cd protobuf-3.7
412-
$ ./configure
413-
$ make
414-
$ make check
415-
$ make install
416-
$ protoc --version
417387

418388
Note that building Hadoop 3.1.1/3.1.2/3.2.0 native code from source is broken
419389
on macOS. For 3.1.1/3.1.2, you need to manually backport YARN-8622. For 3.2.0,
@@ -439,7 +409,6 @@ Requirements:
439409
* Windows System
440410
* JDK 1.8
441411
* Maven 3.0 or later
442-
* ProtocolBuffer 3.7.1
443412
* CMake 3.1 or newer
444413
* Visual Studio 2010 Professional or Higher
445414
* Windows SDK 8.1 (if building CPU rate control for the container executor)

dev-support/docker/Dockerfile

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,6 @@ RUN mkdir -p /opt/cmake \
105105
ENV CMAKE_HOME /opt/cmake
106106
ENV PATH "${PATH}:/opt/cmake/bin"
107107

108-
######
109-
# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
110-
######
111-
# hadolint ignore=DL3003
112-
RUN mkdir -p /opt/protobuf-src \
113-
&& curl -L -s -S \
114-
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
115-
-o /opt/protobuf.tar.gz \
116-
&& tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src \
117-
&& cd /opt/protobuf-src \
118-
&& ./configure --prefix=/opt/protobuf \
119-
&& make install \
120-
&& cd /root \
121-
&& rm -rf /opt/protobuf-src
122-
ENV PROTOBUF_HOME /opt/protobuf
123-
ENV PATH "${PATH}:/opt/protobuf/bin"
124-
125108
######
126109
# Install Apache Maven 3.3.9 (3.3.9 ships with Xenial)
127110
######

0 commit comments

Comments
 (0)