diff options
author | Penn (Dapeng) Zhang <zdapeng@google.com> | 2020-04-21 10:25:08 -0700 |
---|---|---|
committer | Penn (Dapeng) Zhang <zdapeng@google.com> | 2020-04-21 11:34:01 -0700 |
commit | 0a12ac731e37a16b3125e72e917be39d80038b4f (patch) | |
tree | d8338db83871b16b03ea6071914dcc27abc07b03 | |
parent | 049b12818b87aae4df9a92fbe35540b92a653dee (diff) | |
download | grpc-grpc-java-0a12ac731e37a16b3125e72e917be39d80038b4f.tar.gz |
Bump version to 1.29.1-SNAPSHOT
24 files changed, 45 insertions, 45 deletions
diff --git a/build.gradle b/build.gradle index f26c0cc00..c5a9a1403 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.29.0" // CURRENT_GRPC_VERSION + version = "1.29.1-SNAPSHOT" // CURRENT_GRPC_VERSION repositories { maven { // The google mirror is less flaky than mavenCentral() diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index f7cab9cdc..dd5d532cf 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * </pre> */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.29.0)", + value = "by gRPC proto compiler (version 1.29.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index c04c3e284..2ddeace0f 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * </pre> */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.29.0)", + value = "by gRPC proto compiler (version 1.29.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index f2cfcf14f..c487e5b60 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * </pre> */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.29.0)", + value = "by gRPC proto compiler (version 1.29.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index ca8d7c9d2..419edd818 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * </pre> */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.29.0)", + value = "by gRPC proto compiler (version 1.29.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") public final class TestServiceGrpc { diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index 87f3f3cc5..eac20bf32 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -196,7 +196,7 @@ public final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.29.0"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.29.1-SNAPSHOT"; // CURRENT_GRPC_VERSION /** * The default timeout in nanos for a keepalive ping request. diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle index 8c46d033a..3a09acebb 100644 --- a/examples/android/clientcache/app/build.gradle +++ b/examples/android/clientcache/app/build.gradle @@ -30,7 +30,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -50,12 +50,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' testImplementation 'junit:junit:4.12' testImplementation 'com.google.truth:truth:1.0.1' - testImplementation 'io.grpc:grpc-testing:1.29.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index edad97dc7..55f17bf1f 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -29,7 +29,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -49,8 +49,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 0e086d407..86076de2f 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -28,7 +28,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index 77f5899fb..a40d2dcb6 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -29,7 +29,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -49,8 +49,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index 018bcbb7b..f747034ea 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.11.0' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index f1ac3e5fa..74b5e8886 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.11.0' dependencies { diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 6b1de1654..5eaac42a0 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.11.0' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 403a7dffc..58c90c55a 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.29.0</version><!-- CURRENT_GRPC_VERSION --> + <version>1.29.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-gauth</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.29.0</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.29.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.11.0</protobuf.version> <!-- required for jdk9 --> <maven.compiler.source>1.7</maven.compiler.source> diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 12c7c62fc..8c87db710 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -20,7 +20,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.11.0' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 3d5515348..a0b20b6bb 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.29.0</version><!-- CURRENT_GRPC_VERSION --> + <version>1.29.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-hostname</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.29.0</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.29.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protoc.version>3.11.0</protoc.version> <!-- required for jdk9 --> <maven.compiler.source>1.7</maven.compiler.source> diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 2fefca0a9..6e1cf055f 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.11.0' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 6f8647ba5..35a348910 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.29.0</version><!-- CURRENT_GRPC_VERSION --> + <version>1.29.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-jwt-auth</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.29.0</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.29.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.11.0</protobuf.version> <protoc.version>3.11.0</protoc.version> <!-- required for jdk9 --> diff --git a/examples/example-kotlin/android/helloworld/app/build.gradle b/examples/example-kotlin/android/helloworld/app/build.gradle index c84758535..f958879d5 100644 --- a/examples/example-kotlin/android/helloworld/app/build.gradle +++ b/examples/example-kotlin/android/helloworld/app/build.gradle @@ -51,7 +51,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.11.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -73,9 +73,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION } repositories { mavenCentral() } diff --git a/examples/example-kotlin/build.gradle b/examples/example-kotlin/build.gradle index 11f824859..df30762a0 100644 --- a/examples/example-kotlin/build.gradle +++ b/examples/example-kotlin/build.gradle @@ -25,7 +25,7 @@ repositories { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { def kotlinVersion = plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index d5206b306..9e8f9e3b5 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.30.Final' def protocVersion = '3.11.0' diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 943a2dc5a..2a1118246 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.29.0</version><!-- CURRENT_GRPC_VERSION --> + <version>1.29.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-tls</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.29.0</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.29.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protoc.version>3.11.0</protoc.version> <netty.tcnative.version>2.0.30.Final</netty.tcnative.version> <!-- required for jdk9 --> diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 0c7e80923..db6554c70 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -18,7 +18,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.29.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.29.1-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { // This example's client is the same as the helloworld client. We depend on the helloworld diff --git a/examples/pom.xml b/examples/pom.xml index 6c8dfe018..ac683fcc2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.29.0</version><!-- CURRENT_GRPC_VERSION --> + <version>1.29.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>examples</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.29.0</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.29.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.11.0</protobuf.version> <protoc.version>3.11.0</protoc.version> <!-- required for jdk9 --> |