From 1f99df9494c0d18a429784c8a630d3a4cc7b08b9 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 4 Dec 2023 13:13:25 -0800 Subject: [PATCH] Bump version to 1.60.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-oauth/build.gradle | 2 +- examples/example-oauth/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 ++-- 30 files changed, 50 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index e6ae98c77d9..f94321e5738 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.60.0" // CURRENT_GRPC_VERSION + version = "1.60.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 1a1eb21c143..caf8aadf3ba 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.60.0)", + value = "by gRPC proto compiler (version 1.60.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 01b74da67dc..ff4fb91745e 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.60.0)", + value = "by gRPC proto compiler (version 1.60.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 7123f17b0cb..0a4e36de3f9 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.60.0)", + value = "by gRPC proto compiler (version 1.60.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 92fa2722dfa..c9805f26bba 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.60.0)", + value = "by gRPC proto compiler (version 1.60.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 bff268474c8..94f94e1a8f0 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 byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - public static final String IMPLEMENTATION_VERSION = "1.60.0"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.60.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 82ba2e26ca9..281b0e3416c 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.60.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.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.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.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.60.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index dc6eaa85c95..5771b5f25c9 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.60.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.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.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.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 ca9e584c056..e4d71cf7485 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.60.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.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.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.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 60744a20281..456e62f3c0d 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.60.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.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.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.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 6e237b659cb..4bdadf72e5e 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 3d45552f82b..1bc5c07a7f7 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 6bff87e5736..d822bf80e81 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 912d89d9120..a76b367e38f 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-debug https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 47486bf25e1..011fb0afc50 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 98bf26dcee0..f781bbf4883 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index e8ef74156cd..0dae58a0549 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 737217d2379..9e7af0baab1 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 03bbdccb153..ccd97e5e3cc 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 539339ed90c..b12ace6c0e6 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 02d333ecf2b..c0b478120a3 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 3.24.0 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 4f4ba2d673b..c39a2d26671 100644 --- a/examples/example-oauth/build.gradle +++ b/examples/example-oauth/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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/examples/example-oauth/pom.xml b/examples/example-oauth/pom.xml index f7e320a4fd9..2c41725a0ca 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-oauth https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 3.24.0 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index fd817f11d91..d5b9c2202eb 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 886b2a9068b..027948e8e62 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 4d5c21e1ab4..7c1696b973c 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 3dff50696cf..c24840cfc10 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.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 ae0a8c15b1a..a94c0f1c9fe 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT example-tls https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 8ad629d743f..9cca4ca11b4 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.60.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 7425de94b5a..8cc23eb6161 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0 + 1.60.1-SNAPSHOT examples https://github.com/grpc/grpc-java UTF-8 - 1.60.0 + 1.60.1-SNAPSHOT 3.24.0 3.24.0