diff --git a/build.gradle b/build.gradle index 1adde311421..ae255961566 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.60.2-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.60.2" // 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 0461b907de6..e2cc8e1997c 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.2-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.2)", 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 6b289f094e7..a936b67ca08 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.2-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.2)", 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 758b75939d0..37d0651490a 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.2-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.2)", 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 9adff06b14e..5cf56fc89e8 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.2-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.60.2)", 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 44bce638df7..eac9e449614 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.2-SNAPSHOT"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.60.2"; // 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 d0288fb3edd..92e626b73e0 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2' // 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.2' // 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.60.2' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index ac1bd8fdabc..c26edbf95bb 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2' // 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.2' // 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 77326c8b96f..088fa4866f5 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2' // 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.2' // 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 d93be5a604d..727a7843f33 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2' // 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.60.2' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.60.2' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index dfa63014375..35c5dbc670f 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // 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 73487f29467..c456df7b782 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index 34236ec2520..93a372a5004 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 6da52168cd2..d76f533fb4e 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-debug https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index e8a53ec9237..ceb3c6f539e 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // 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 ca9dfaa7e82..655bb2defd2 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index ccd5508c62a..cc6c2679bbb 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 29d8f03863b..f6394bd31f6 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index afab7cd75e9..4dd20bccdd8 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 90f179486d4..70a5a3447ce 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // 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 0a583da85e1..20e725cf276 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 3.24.0 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 3d4a9b50c89..45d6c2452fd 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // 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 e5baa0aafeb..f8e9676388c 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-oauth https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 3.24.0 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 0fe6a99b4d2..1465352caba 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index 79642dcf37a..98c1557ad9a 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index c482ecfdc4e..86a84fdaba9 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 0be1652bfd6..c4b79396c80 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index f562afee746..133aef4061a 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 08ab67e5a4a..674e852ee9f 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.2-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 1d80e68bd93..f33e6c463ea 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.60.2-SNAPSHOT + 1.60.2 examples https://github.com/grpc/grpc-java UTF-8 - 1.60.2-SNAPSHOT + 1.60.2 3.24.0 3.24.0