From c017f7eda0104de20e5aecfc571a6655c0fa3eaf Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 16 May 2024 11:45:05 -0700 Subject: [PATCH] Bump version to 1.63.1 --- 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 f15251fdbc0..e92b959657f 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.63.1-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.63.1" // 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 0277e929838..97b741f3a5d 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.63.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.63.1)", 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 d858ea60ac2..85f59d42623 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.63.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.63.1)", 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 f500a6403e8..1f1d58ae224 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.63.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.63.1)", 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 114e8874829..dbc5e807e56 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.63.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.63.1)", 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 117722b4067..e071e667640 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -221,7 +221,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - public static final String IMPLEMENTATION_VERSION = "1.63.1-SNAPSHOT"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.63.1"; // 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 613a4237901..98c216cfb85 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.25.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1' // 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.63.1' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' testImplementation 'junit:junit:4.13.2' testImplementation 'com.google.truth:truth:1.1.5' - testImplementation 'io.grpc:grpc-testing:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.63.1' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 3c9b9b60783..3622ee46036 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.25.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1' // 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.63.1' // 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 c6cac28669f..8d03482ae58 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.25.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1' // 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.63.1' // 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 a7d2d48e4eb..c29ba3ed2b0 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.25.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.63.1' // 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.63.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.63.1' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 7c90fe1ee4a..7b0ef9e778a 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 339ccc9cfee..ee934110de4 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index e70216fad67..336efd23764 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index c30a366ad45..c10f1b1482f 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-debug https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 0f5dbee05bb..2daf21f502e 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 9e1bf94bceb..3f839532e54 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index 759d7bbc1ba..7eafb4e8cad 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index a32ffb13b67..e3b0c518cf3 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 43e03ec7461..069a9b50cd6 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index b0a2a380ad4..72daa33cc5c 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 2e7ed542f25..7ef30aa7d87 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 3.25.1 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 9efec45f595..3cc27185565 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.25.1' def protocVersion = protobufVersion diff --git a/examples/example-oauth/pom.xml b/examples/example-oauth/pom.xml index 052a6e27bbd..744b64c3772 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-oauth https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 3.25.1 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 8b84c195e4c..95d6d88c4c1 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index 0869ee1eef2..5e784a577a0 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 3bd2d0bc2d1..262393ac20e 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index eb9879a0426..b041a61e71f 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index cee936f5a63..964163c1ba6 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index ce2f9a7538f..ecd1c2925b1 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.63.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.63.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 181ee2094d8..5ecd2e404a9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.63.1-SNAPSHOT + 1.63.1 examples https://github.com/grpc/grpc-java UTF-8 - 1.63.1-SNAPSHOT + 1.63.1 3.25.1 3.25.1