From 86d64122e5fa440827028db735a0cba938f8464f Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Fri, 5 Jan 2018 16:40:20 -0800 Subject: [PATCH] Upgrade to Protobuf 3.5.1 and Protoc 3.5.1-1. (#3921) protoc-3.5.0-linux-x86_64 introduced GLIBC_2.14 dependency and broke gRPC release process (https://github.com/google/protobuf/issues/4138). 3.5.1-1 is the proper re-build. --- .travis.yml | 2 +- COMPILING.md | 10 +++++----- README.md | 4 ++-- android-interop-testing/app/build.gradle | 2 +- build.gradle | 4 ++-- buildscripts/kokoro/unix.sh | 2 +- buildscripts/make_dependencies.bat | 2 +- compiler/Dockerfile | 2 +- examples/android/helloworld/app/build.gradle | 2 +- examples/android/routeguide/app/build.gradle | 2 +- examples/build.gradle | 2 +- examples/pom.xml | 2 +- repositories.bzl | 8 ++++---- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fe34c3430..aa15eea7b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: java env: global: - GRADLE_OPTS=-Xmx512m - - PROTOBUF_VERSION=3.5.0 + - PROTOBUF_VERSION=3.5.1 - LDFLAGS=-L/tmp/protobuf/lib - CXXFLAGS=-I/tmp/protobuf/include - LD_LIBRARY_PATH=/tmp/protobuf/lib diff --git a/COMPILING.md b/COMPILING.md index 6b3c642fb1..0e4b5e668d 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -33,7 +33,7 @@ For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.5.0 +$ git checkout v3.5.1 $ ./autogen.sh $ ./configure $ make @@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for Gradle to find protobuf: ``` .\gradlew install ^ - -PvcProtobufInclude=C:\path\to\protobuf-3.5.0\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.5.0\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.5.1\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.5.1\vsprojects\Release ^ -PtargetArch=x86_32 ``` Since specifying those properties every build is bothersome, you can instead create ``\gradle.properties`` with contents like: ``` -vcProtobufInclude=C:\\path\\to\\protobuf-3.5.0\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.5.0\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.5.1\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.5.1\\vsprojects\\Release targetArch=x86_32 ``` diff --git a/README.md b/README.md index d73de63c1d..d2eb2023c6 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use protobuf-maven-plugin 0.5.0 - com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier} @@ -123,7 +123,7 @@ buildscript { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.5.0" + artifact = "com.google.protobuf:protoc:3.5.1-1" } plugins { grpc { diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 3d44d4bf48..7a26317535 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -30,7 +30,7 @@ android { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.5.0' + artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { grpc { diff --git a/build.gradle b/build.gradle index 40ef909d70..ac71a01498 100644 --- a/build.gradle +++ b/build.gradle @@ -98,8 +98,8 @@ subprojects { nettyVersion = '4.1.17.Final' guavaVersion = '19.0' - protobufVersion = '3.5.0' - protocVersion = protobufVersion + protobufVersion = '3.5.1' + protocVersion = '3.5.1-1' protobufNanoVersion = '3.0.0-alpha-5' configureProtoCompilation = { diff --git a/buildscripts/kokoro/unix.sh b/buildscripts/kokoro/unix.sh index 0ab99457b7..b5be835872 100755 --- a/buildscripts/kokoro/unix.sh +++ b/buildscripts/kokoro/unix.sh @@ -7,7 +7,7 @@ set -exu -o pipefail export GRADLE_OPTS=-Xmx512m -export PROTOBUF_VERSION=3.5.0 +export PROTOBUF_VERSION=3.5.1 export LDFLAGS=-L/tmp/protobuf/lib export CXXFLAGS=-I/tmp/protobuf/include export LD_LIBRARY_PATH=/tmp/protobuf/lib diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat index 4c06200616..b7b271c644 100644 --- a/buildscripts/make_dependencies.bat +++ b/buildscripts/make_dependencies.bat @@ -1,4 +1,4 @@ -set PROTOBUF_VER=3.5.0 +set PROTOBUF_VER=3.5.1 set CMAKE_NAME=cmake-3.3.2-win32-x86 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" ( diff --git a/compiler/Dockerfile b/compiler/Dockerfile index 370006f278..d76cb78ad8 100644 --- a/compiler/Dockerfile +++ b/compiler/Dockerfile @@ -2,7 +2,7 @@ FROM protoc-artifacts:latest RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \ git fetch && \ - git checkout v3.5.0 && \ + git checkout v3.5.1 && \ ./autogen.sh && \ CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 && \ make clean && make -j$(nproc) && make -j$(nproc) install"' diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index ce5b34ddce..19aa256681 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -28,7 +28,7 @@ android { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.5.0' + artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index a654fade4a..ed64a83d6a 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -25,7 +25,7 @@ android { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.5.0' + artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { diff --git a/examples/build.gradle b/examples/build.gradle index 07f2f5837b..c2703bd719 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -37,7 +37,7 @@ dependencies { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.5.0' + artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { grpc { diff --git a/examples/pom.xml b/examples/pom.xml index d1a140bc02..3ccfb92622 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -67,7 +67,7 @@ protobuf-maven-plugin 0.5.0 - com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} diff --git a/repositories.bzl b/repositories.bzl index a98f75df55..717446d995 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -139,8 +139,8 @@ def com_google_protobuf(): native.http_archive( name = "com_google_protobuf", sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30", - strip_prefix = "protobuf-3.5.0", - urls = ["https://github.com/google/protobuf/archive/v3.5.0.zip"], + strip_prefix = "protobuf-3.5.1", + urls = ["https://github.com/google/protobuf/archive/v3.5.1.zip"], ) def com_google_protobuf_java(): @@ -149,8 +149,8 @@ def com_google_protobuf_java(): native.http_archive( name = "com_google_protobuf_java", sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30", - strip_prefix = "protobuf-3.5.0", - urls = ["https://github.com/google/protobuf/archive/v3.5.0.zip"], + strip_prefix = "protobuf-3.5.1", + urls = ["https://github.com/google/protobuf/archive/v3.5.1.zip"], ) def com_google_protobuf_nano_protobuf_javanano():