From 503883bcf28d17e741351ad25ceac3d916c05159 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Mon, 24 Jul 2023 17:17:00 -0700 Subject: [PATCH] Bump version to 1.57.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 741f50c02cd..31801ef291b 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.57.0" // CURRENT_GRPC_VERSION + version = "1.57.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 c50a28178fc..c0463a72b93 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.57.0)", + value = "by gRPC proto compiler (version 1.57.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 2608671a937..6855de44795 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.57.0)", + value = "by gRPC proto compiler (version 1.57.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 7b63cc0a328..e1799c1a425 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.57.0)", + value = "by gRPC proto compiler (version 1.57.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 9f412a11a0f..224306dc66b 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.57.0)", + value = "by gRPC proto compiler (version 1.57.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 42608f6d8ae..496ce8bd325 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -218,7 +218,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.57.0"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.57.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 d6ba675f581..7f05f993ca1 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -54,12 +54,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.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.57.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.57.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.57.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 1aa6443d9a8..09e32a386c3 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,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.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.57.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.57.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 e36e00e52b2..80a9182accc 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,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.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.57.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.57.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 7d8bfc5d832..f7e82e02377 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -53,8 +53,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.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.57.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.57.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.57.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 49be84d69cd..ba58e52984f 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 36d0f5a35fa..4b51caf8c94 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index eef7089e1dc..2c635dd57fc 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index cf4e0d1cda9..9f1f96f23c1 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT example-debug https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 3f96600bdbd..1bd9327be47 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index f028faf228b..edf62cc10ce 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index aae0a8f7f0e..1ae498288a8 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -24,7 +24,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 4369b3eff3a..df69336d660 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 9dd7b23a4e9..fbb344839b9 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index a1ce4caec09..1551439ba6e 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 7f8f642c316..c4984c14d94 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 3.22.3 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 00bcb644951..c397d8422f2 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -17,7 +17,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index 498724116a4..5535cdf7bae 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -17,7 +17,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 2a9e3c0a718..b3c8dcd7eae 100644 --- a/examples/example-servlet/build.gradle +++ b/examples/example-servlet/build.gradle @@ -15,7 +15,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index e2fd0df22fe..f712e048350 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index ee5540eced3..4b4f5ae5983 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT example-tls https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 5b6f9d53b98..52f08ad2e84 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.8 // 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.57.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.57.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 93c4b50d50e..44144a2acab 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.57.0 + 1.57.1-SNAPSHOT examples https://github.com/grpc/grpc-java UTF-8 - 1.57.0 + 1.57.1-SNAPSHOT 3.22.3 3.22.3