From e2ed2e8f038a2360b3d191c181e57fd0375d2a5f Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Wed, 27 Jan 2016 08:26:19 -0800 Subject: [PATCH] Upgrade to protobuf-3.0.0-beta-2 and protobuf-nano-3.0.0-alpha-5 Update option name that disables protobuf tests. --- .travis.yml | 2 +- COMPILING.md | 12 ++++++------ README.md | 4 ++-- android-interop-testing/app/build.gradle | 2 +- .../main/java/io/grpc/testing/ClientConfig.java | 2 +- build.gradle | 4 ++-- buildscripts/jenkins-pre.bat | 4 ++-- buildscripts/make_dependencies.bat | 6 +++--- buildscripts/make_dependencies.sh | 5 +++++ compiler/Dockerfile | 2 +- compiler/README.md | 2 +- examples/android/app/build.gradle | 2 +- .../io/grpc/examples/helloworld/HelloRequest.java | 2 +- .../io/grpc/examples/helloworld/HelloResponse.java | 2 +- .../java/io/grpc/examples/routeguide/Feature.java | 2 +- .../java/io/grpc/examples/routeguide/RouteNote.java | 2 +- .../io/grpc/grpclb/InitialLoadBalanceRequest.java | 2 +- .../io/grpc/grpclb/InitialLoadBalanceResponse.java | 2 +- .../generated/main/java/io/grpc/grpclb/Server.java | 4 ++-- .../java/io/grpc/testing/integration/Messages.java | 6 +++--- 20 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13b2d0181a..108a878565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: java env: global: - - PROTOBUF_VERSION=3.0.0-beta-1 + - PROTOBUF_VERSION=3.0.0-beta-2 - OPENSSL_VERSION=1.0.2d - LDFLAGS=-L/tmp/protobuf-${PROTOBUF_VERSION}/lib - CXXFLAGS=-I/tmp/protobuf-${PROTOBUF_VERSION}/include diff --git a/COMPILING.md b/COMPILING.md index fd7251a9c8..9fd2257120 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -27,13 +27,13 @@ This section is only necessary if you are making changes to the code generation. Most users only need to use `skipCodegen=true` as discussed above. ### Build Protobuf -The codegen plugin is C++ code and requires protobuf 3.0.0-beta-1. +The codegen plugin is C++ code and requires protobuf 3.0.0-beta-2. For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.0.0-beta-1 +$ git checkout v3.0.0-beta-2 $ ./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.0.0-beta-1\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-1\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.0.0-beta-2\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.0.0-beta-2\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.0.0-beta-1\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-1\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.0.0-beta-2\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.0.0-beta-2\\vsprojects\\Release targetArch=x86_32 ``` diff --git a/README.md b/README.md index 2bc3a6ff6b..ab234c9f19 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:3.0.0-beta-1:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.0.0-beta-2:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:0.9.0:exe:${os.detected.classifier} @@ -129,7 +129,7 @@ protobuf { // The version of protoc must match protobuf-java. If you don't depend on // protobuf-java directly, you will be transitively depending on the // protobuf-java version that grpc depends on. - artifact = "com.google.protobuf:protoc:3.0.0-beta-1" + artifact = "com.google.protobuf:protoc:3.0.0-beta-2" } plugins { grpc { diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index a195e5d282..6b04b14daf 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -28,7 +28,7 @@ android { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.0.0-beta-1' + artifact = 'com.google.protobuf:protoc:3.0.0-beta-2' } plugins { grpc { diff --git a/benchmarks/src/generated/main/java/io/grpc/testing/ClientConfig.java b/benchmarks/src/generated/main/java/io/grpc/testing/ClientConfig.java index 33c12efbaa..9a917adf55 100644 --- a/benchmarks/src/generated/main/java/io/grpc/testing/ClientConfig.java +++ b/benchmarks/src/generated/main/java/io/grpc/testing/ClientConfig.java @@ -50,7 +50,7 @@ public final class ClientConfig extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { serverTargets_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; diff --git a/build.gradle b/build.gradle index 3c38e9aa4f..ba8851bf03 100644 --- a/build.gradle +++ b/build.gradle @@ -54,8 +54,8 @@ subprojects { protocPluginBaseName = 'protoc-gen-grpc-java' javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" - protobufVersion = '3.0.0-beta-1' - protobufNanoVersion = '3.0.0-alpha-4' + protobufVersion = '3.0.0-beta-2' + protobufNanoVersion = '3.0.0-alpha-5' configureProtoCompilation = { String generatedSourcePath = "${projectDir}/src/generated" diff --git a/buildscripts/jenkins-pre.bat b/buildscripts/jenkins-pre.bat index dbe4d033cf..f0e6785d2b 100644 --- a/buildscripts/jenkins-pre.bat +++ b/buildscripts/jenkins-pre.bat @@ -13,5 +13,5 @@ cd "%WORKSPACE%" set ESCWORKSPACE=%WORKSPACE:\=\\% echo targetArch=x86_32> gradle.properties -echo vcProtobufLibs=%ESCWORKSPACE%\\grpc-java-helper\\protobuf-3.0.0-beta-1\\cmake\\build\\Release>> gradle.properties -echo vcProtobufInclude=%ESCWORKSPACE%\\grpc-java-helper\\protobuf-3.0.0-beta-1\\cmake\\build\\include>> gradle.properties +echo vcProtobufLibs=%ESCWORKSPACE%\\grpc-java-helper\\protobuf-3.0.0-beta-2\\cmake\\build\\Release>> gradle.properties +echo vcProtobufInclude=%ESCWORKSPACE%\\grpc-java-helper\\protobuf-3.0.0-beta-2\\cmake\\build\\include>> gradle.properties diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat index 403efe89f3..828dfcfa99 100644 --- a/buildscripts/make_dependencies.bat +++ b/buildscripts/make_dependencies.bat @@ -5,7 +5,7 @@ REM Prerequisite: REM 7za.exe in current directory or PATH REM Install http://slproweb.com/download/Win64OpenSSL_Light-1_0_2d.exe -set PROTOBUF_VER=3.0.0-beta-1 +set PROTOBUF_VER=3.0.0-beta-2 set CMAKE_NAME=cmake-3.3.2-win32-x86 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" ( @@ -26,10 +26,10 @@ set PATH=%PATH%;%cd%\%CMAKE_NAME%\bin powershell -command "& { iwr https://github.com/google/protobuf/archive/v%PROTOBUF_VER%.zip -OutFile protobuf.zip }" 7za X protobuf.zip del protobuf.zip -pushd protobuf-3.0.0-beta-1\cmake +pushd protobuf-3.0.0-beta-2\cmake mkdir build cd build -cmake -DBUILD_TESTING=OFF .. +cmake -Dprotobuf_BUILD_TESTS=OFF .. msbuild /maxcpucount /p:Configuration=Release libprotoc.vcxproj call extract_includes.bat popd diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh index f4cb25b10e..a1f761d843 100755 --- a/buildscripts/make_dependencies.sh +++ b/buildscripts/make_dependencies.sh @@ -7,6 +7,11 @@ DOWNLOAD_DIR=/tmp/source INSTALL_DIR=/tmp/protobuf-${PROTOBUF_VERSION} mkdir -p $DOWNLOAD_DIR +# We may have set this elsewhere in order to allow gRPC find our custom +# built openssl to run ALPN, but it may be incompatible with wget which +# uses the system openssl. We unset this variable for this script. +export -n LD_LIBRARY_PATH + # Make protoc # Can't check for presence of directory as cache auto-creates it. if [ -f ${INSTALL_DIR}/bin/protoc ]; then diff --git a/compiler/Dockerfile b/compiler/Dockerfile index 1c4bb4910a..759afbff1e 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.0.0-beta-1 && \ + git checkout v3.0.0-beta-2 && \ ./autogen.sh && \ CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 -j$(nproc) && \ make clean && make && make install"' diff --git a/compiler/README.md b/compiler/README.md index ce89ca573c..e78c08d89e 100644 --- a/compiler/README.md +++ b/compiler/README.md @@ -13,7 +13,7 @@ build your own codegen. * Linux, Mac OS X with Clang, or Windows with MSYS2 * Java 7 or up -* [Protobuf](https://github.com/google/protobuf) 3.0.0-beta-1 or up +* [Protobuf](https://github.com/google/protobuf) 3.0.0-beta-2 or up ## Compiling and testing the codegen Change to the `compiler` directory: diff --git a/examples/android/app/build.gradle b/examples/android/app/build.gradle index 30dcd733c3..192044ae5e 100644 --- a/examples/android/app/build.gradle +++ b/examples/android/app/build.gradle @@ -25,7 +25,7 @@ android { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.0.0-beta-1' + artifact = 'com.google.protobuf:protoc:3.0.0-beta-2' } plugins { grpc { diff --git a/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloRequest.java b/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloRequest.java index 316b9963bc..d8e53c1376 100644 --- a/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloRequest.java +++ b/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloRequest.java @@ -47,7 +47,7 @@ public final class HelloRequest extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); name_ = s; break; diff --git a/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloResponse.java b/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloResponse.java index e31e45d002..13a6ff9016 100644 --- a/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloResponse.java +++ b/examples/src/generated/main/java/io/grpc/examples/helloworld/HelloResponse.java @@ -47,7 +47,7 @@ public final class HelloResponse extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); message_ = s; break; diff --git a/examples/src/generated/main/java/io/grpc/examples/routeguide/Feature.java b/examples/src/generated/main/java/io/grpc/examples/routeguide/Feature.java index 827d309480..be77f97374 100644 --- a/examples/src/generated/main/java/io/grpc/examples/routeguide/Feature.java +++ b/examples/src/generated/main/java/io/grpc/examples/routeguide/Feature.java @@ -48,7 +48,7 @@ public final class Feature extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); name_ = s; break; diff --git a/examples/src/generated/main/java/io/grpc/examples/routeguide/RouteNote.java b/examples/src/generated/main/java/io/grpc/examples/routeguide/RouteNote.java index 867cfc1d90..1b38c0a5de 100644 --- a/examples/src/generated/main/java/io/grpc/examples/routeguide/RouteNote.java +++ b/examples/src/generated/main/java/io/grpc/examples/routeguide/RouteNote.java @@ -60,7 +60,7 @@ public final class RouteNote extends break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); message_ = s; break; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java index 6743a0a558..47dc984d6a 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java @@ -43,7 +43,7 @@ public final class InitialLoadBalanceRequest extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); name_ = s; break; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java index 0857dcaf69..8abf0ceb28 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java @@ -42,7 +42,7 @@ public final class InitialLoadBalanceResponse extends break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); initialResponseTypeCase_ = 2; initialResponseType_ = s; break; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java index 5f3ee8ed7e..a1bc3d0d85 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java @@ -46,7 +46,7 @@ public final class Server extends break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); ipAddress_ = s; break; @@ -57,7 +57,7 @@ public final class Server extends break; } case 26: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); loadBalanceToken_ = s; break; diff --git a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java index 4827673663..18124a7557 100644 --- a/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java +++ b/interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java @@ -1738,13 +1738,13 @@ public final class Messages { break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); username_ = s; break; } case 26: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); oauthScope_ = s; break; @@ -2583,7 +2583,7 @@ public final class Messages { break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); value_ = s; break;