Skip to content

Commit 86d6412

Browse files
authored
Upgrade to Protobuf 3.5.1 and Protoc 3.5.1-1. (grpc#3921)
protoc-3.5.0-linux-x86_64 introduced GLIBC_2.14 dependency and broke gRPC release process (protocolbuffers/protobuf#4138). 3.5.1-1 is the proper re-build.
1 parent 5aed252 commit 86d6412

File tree

13 files changed

+22
-22
lines changed

13 files changed

+22
-22
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: java
55
env:
66
global:
77
- GRADLE_OPTS=-Xmx512m
8-
- PROTOBUF_VERSION=3.5.0
8+
- PROTOBUF_VERSION=3.5.1
99
- LDFLAGS=-L/tmp/protobuf/lib
1010
- CXXFLAGS=-I/tmp/protobuf/include
1111
- LD_LIBRARY_PATH=/tmp/protobuf/lib

COMPILING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
3333
```
3434
$ git clone https://github.com/google/protobuf.git
3535
$ cd protobuf
36-
$ git checkout v3.5.0
36+
$ git checkout v3.5.1
3737
$ ./autogen.sh
3838
$ ./configure
3939
$ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
7272
Gradle to find protobuf:
7373
```
7474
.\gradlew install ^
75-
-PvcProtobufInclude=C:\path\to\protobuf-3.5.0\src ^
76-
-PvcProtobufLibs=C:\path\to\protobuf-3.5.0\vsprojects\Release ^
75+
-PvcProtobufInclude=C:\path\to\protobuf-3.5.1\src ^
76+
-PvcProtobufLibs=C:\path\to\protobuf-3.5.1\vsprojects\Release ^
7777
-PtargetArch=x86_32
7878
```
7979

8080
Since specifying those properties every build is bothersome, you can instead
8181
create ``<project-root>\gradle.properties`` with contents like:
8282
```
83-
vcProtobufInclude=C:\\path\\to\\protobuf-3.5.0\\src
84-
vcProtobufLibs=C:\\path\\to\\protobuf-3.5.0\\vsprojects\\Release
83+
vcProtobufInclude=C:\\path\\to\\protobuf-3.5.1\\src
84+
vcProtobufLibs=C:\\path\\to\\protobuf-3.5.1\\vsprojects\\Release
8585
targetArch=x86_32
8686
```
8787

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
8585
<artifactId>protobuf-maven-plugin</artifactId>
8686
<version>0.5.0</version>
8787
<configuration>
88-
<protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
88+
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
8989
<pluginId>grpc-java</pluginId>
9090
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
9191
</configuration>
@@ -123,7 +123,7 @@ buildscript {
123123
124124
protobuf {
125125
protoc {
126-
artifact = "com.google.protobuf:protoc:3.5.0"
126+
artifact = "com.google.protobuf:protoc:3.5.1-1"
127127
}
128128
plugins {
129129
grpc {

android-interop-testing/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030

3131
protobuf {
3232
protoc {
33-
artifact = 'com.google.protobuf:protoc:3.5.0'
33+
artifact = 'com.google.protobuf:protoc:3.5.1-1'
3434
}
3535
plugins {
3636
grpc {

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ subprojects {
9898

9999
nettyVersion = '4.1.17.Final'
100100
guavaVersion = '19.0'
101-
protobufVersion = '3.5.0'
102-
protocVersion = protobufVersion
101+
protobufVersion = '3.5.1'
102+
protocVersion = '3.5.1-1'
103103
protobufNanoVersion = '3.0.0-alpha-5'
104104

105105
configureProtoCompilation = {

buildscripts/kokoro/unix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
set -exu -o pipefail
88

99
export GRADLE_OPTS=-Xmx512m
10-
export PROTOBUF_VERSION=3.5.0
10+
export PROTOBUF_VERSION=3.5.1
1111
export LDFLAGS=-L/tmp/protobuf/lib
1212
export CXXFLAGS=-I/tmp/protobuf/include
1313
export LD_LIBRARY_PATH=/tmp/protobuf/lib

buildscripts/make_dependencies.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set PROTOBUF_VER=3.5.0
1+
set PROTOBUF_VER=3.5.1
22
set CMAKE_NAME=cmake-3.3.2-win32-x86
33

44
if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (

compiler/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM protoc-artifacts:latest
22

33
RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \
44
git fetch && \
5-
git checkout v3.5.0 && \
5+
git checkout v3.5.1 && \
66
./autogen.sh && \
77
CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 && \
88
make clean && make -j$(nproc) && make -j$(nproc) install"'

examples/android/helloworld/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828

2929
protobuf {
3030
protoc {
31-
artifact = 'com.google.protobuf:protoc:3.5.0'
31+
artifact = 'com.google.protobuf:protoc:3.5.1-1'
3232
}
3333
plugins {
3434
javalite {

examples/android/routeguide/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android {
2525

2626
protobuf {
2727
protoc {
28-
artifact = 'com.google.protobuf:protoc:3.5.0'
28+
artifact = 'com.google.protobuf:protoc:3.5.1-1'
2929
}
3030
plugins {
3131
javalite {

0 commit comments

Comments
 (0)