From d7c590f7ee368b23022f8f13342e2e38a80d93c5 Mon Sep 17 00:00:00 2001 From: yifeizhuang Date: Wed, 6 Sep 2023 00:43:41 +0000 Subject: [PATCH] Bump version to 1.58.1-SNAPSHOT --- build.gradle | 2 +- .../src/test/golden/TestDeprecatedService.java.txt | 2 +- compiler/src/test/golden/TestService.java.txt | 2 +- .../src/testLite/golden/TestDeprecatedService.java.txt | 2 +- compiler/src/testLite/golden/TestService.java.txt | 2 +- core/src/main/java/io/grpc/internal/GrpcUtil.java | 2 +- examples/android/clientcache/app/build.gradle | 10 +++++----- examples/android/helloworld/app/build.gradle | 8 ++++---- examples/android/routeguide/app/build.gradle | 8 ++++---- examples/android/strictmode/app/build.gradle | 8 ++++---- examples/build.gradle | 2 +- examples/example-alts/build.gradle | 2 +- examples/example-debug/build.gradle | 2 +- examples/example-debug/pom.xml | 4 ++-- examples/example-gauth/build.gradle | 2 +- examples/example-gauth/pom.xml | 4 ++-- examples/example-gcp-observability/build.gradle | 2 +- examples/example-hostname/build.gradle | 2 +- examples/example-hostname/pom.xml | 4 ++-- examples/example-jwt-auth/build.gradle | 2 +- examples/example-jwt-auth/pom.xml | 4 ++-- examples/example-orca/build.gradle | 2 +- examples/example-reflection/build.gradle | 2 +- examples/example-servlet/build.gradle | 2 +- examples/example-tls/build.gradle | 2 +- examples/example-tls/pom.xml | 4 ++-- examples/example-xds/build.gradle | 2 +- examples/pom.xml | 4 ++-- 28 files changed, 47 insertions(+), 47 deletions(-) diff --git a/build.gradle b/build.gradle index 1ddba5125d..9b1f50d204 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.58.0" // CURRENT_GRPC_VERSION + version = "1.58.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 9d1e29b567..1ad8672171 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.58.0)", + value = "by gRPC proto compiler (version 1.58.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @io.grpc.stub.annotations.GrpcGenerated @java.lang.Deprecated diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index bcf84d62bb..75aee2a6cb 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.58.0)", + value = "by gRPC proto compiler (version 1.58.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @io.grpc.stub.annotations.GrpcGenerated public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index cec9cb09b8..aa78b8fb72 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.58.0)", + value = "by gRPC proto compiler (version 1.58.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @io.grpc.stub.annotations.GrpcGenerated @java.lang.Deprecated diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 2cf49074fe..d9451c0976 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.58.0)", + value = "by gRPC proto compiler (version 1.58.1-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @io.grpc.stub.annotations.GrpcGenerated 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 3ab59b2fcf..c399152fce 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -220,7 +220,7 @@ public final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.58.0"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.58.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 4301213bdc..7f41d0877f 100644 --- a/examples/android/clientcache/app/build.gradle +++ b/examples/android/clientcache/app/build.gradle @@ -34,7 +34,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -54,12 +54,12 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.58.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' testImplementation 'junit:junit:4.13.2' testImplementation 'com.google.truth:truth:1.0.1' - testImplementation 'io.grpc:grpc-testing:1.58.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 8ca6d16b2c..1e7ed5ab9f 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -32,7 +32,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.58.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 6bf9264fcd..00bf820096 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -32,7 +32,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.58.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index b6db0182d7..6ecbafecae 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -33,7 +33,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -53,8 +53,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.58.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.58.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 0f1ad3593d..f402ff98af 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -23,7 +23,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 48c128cf7e..95f7165541 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -24,7 +24,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index c22f316c66..d3e4bfc2fa 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -25,7 +25,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index a5eed741ca..bf4ae3f612 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT example-debug https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 280a7d8287..858dc59b75 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -24,7 +24,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index f5e5774b7c..94107ae7d3 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index 8cae7a3dff..e5010837ea 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -25,7 +25,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 61e7d07698..61f1321b95 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -23,7 +23,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 8b1d2d1ef6..75544b2e96 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 789a0050d8..1f6d797e5d 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -23,7 +23,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 8b8d2450dd..9db7aea19a 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 3.24.0 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index c8db2e340b..51f301cafc 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -18,7 +18,7 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -def grpcVersion = '1.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index b99a10af67..b2d5d431d9 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -18,7 +18,7 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -def grpcVersion = '1.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 964bc41ff6..ca0c0cece3 100644 --- a/examples/example-servlet/build.gradle +++ b/examples/example-servlet/build.gradle @@ -16,7 +16,7 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -def grpcVersion = '1.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 69a64df401..b914a95417 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -24,7 +24,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index cc29c6c6f5..3a30a9e542 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT example-tls https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index a3878a8efc..bdee892ab3 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -23,7 +23,7 @@ java { // 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.58.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.58.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 2eba4d503a..3982147ed6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.58.0 + 1.58.1-SNAPSHOT examples https://github.com/grpc/grpc-java UTF-8 - 1.58.0 + 1.58.1-SNAPSHOT 3.24.0 3.24.0