From eb8b1d8379008ab89cade89392d265bed90a2692 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 4 Dec 2023 13:06:44 -0800 Subject: [PATCH] Bump version to 1.60.0 --- 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 52c7bae6ef5..e6ae98c77d9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.60.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.60.0" // 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 9a4ea680e2a..1a1eb21c143 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-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.0)", 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 4a2322f6b03..01b74da67dc 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-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.0)", 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 b78b092a744..7123f17b0cb 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-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.0)", 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 13acf049327..92fa2722dfa 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-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.0)", 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 5a5d6cf4f30..bff268474c8 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-SNAPSHOT"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.60.0"; // 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 4db9688c650..82ba2e26ca9 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-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.0' // 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-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 '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-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.60.0' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 1a6c009c6bb..dc6eaa85c95 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-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.0' // 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-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 '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 26261be8a8e..ca9e584c056 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-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.0' // 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-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 '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 da4164edc96..60744a20281 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-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.0' // 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-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 46dbc5d925d..6e237b659cb 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // 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 5790bea61bc..3d45552f82b 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index bbfab4fedf4..6bff87e5736 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 006e9099d5c..912d89d9120 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-debug https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 7c2af3442bb..47486bf25e1 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // 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 87bf8c86425..98bf26dcee0 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index e5bca3602e9..e8ef74156cd 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 161d2441dc6..737217d2379 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 292961b785a..03bbdccb153 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 88920a06397..539339ed90c 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // 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 af7b3641e58..02d333ecf2b 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 3.24.0 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 97fd0667bf7..4f4ba2d673b 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // 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 0450b10e5d7..f7e320a4fd9 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-oauth https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 3.24.0 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 78c39f4ea0a..fd817f11d91 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index f6ae7424380..886b2a9068b 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 822c93479c8..4d5c21e1ab4 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 0b79d16632f..3dff50696cf 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 15af0cca9b1..ae0a8c15b1a 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 2cca6e87bbe..8ad629d743f 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-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.0' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 30079735b00..7425de94b5a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.0-SNAPSHOT + 1.60.0 examples https://github.com/grpc/grpc-java UTF-8 - 1.60.0-SNAPSHOT + 1.60.0 3.24.0 3.24.0