From a2adefac6cd94711b60014868644919af8d2c6e7 Mon Sep 17 00:00:00 2001 From: Larry Safran Date: Wed, 10 Jul 2024 18:13:44 -0700 Subject: [PATCH] Bump version to 1.65.1 --- build.gradle | 2 +- .../src/test/golden/TestDeprecatedService.java.txt | 2 +- compiler/src/test/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-csm-observability/build.gradle | 2 +- 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-opentelemetry/build.gradle | 2 +- 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 7140713a9ce..d514a74e2f1 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.65.1-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.65.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 576b4f8f8ce..b12c8840474 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.65.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.65.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 7d151f7f819..d12d6728830 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.65.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.65.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 81c5da2bb9f..09fa21d7b34 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.65.1-SNAPSHOT"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.65.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 23fac05592c..2bff10a9fc9 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.65.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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.65.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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.65.1' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index a03a0963354..57a958e99d2 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.65.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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.65.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 27c42276a5e..77215431463 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.65.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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.65.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 95da277a33d..0df259685c3 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.65.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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.65.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.65.1' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index d437cd0ff5e..ca97c9b837b 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 d248df07bfd..1707b78b119 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 ef798c664cd..2d885c7139b 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 8e2b69b9b0f..5116736191b 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-debug https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 71e6f6a3738..ca3bb66ea17 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 c499606a604..074839ff0a8 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 1.8 diff --git a/examples/example-gcp-csm-observability/build.gradle b/examples/example-gcp-csm-observability/build.gradle index aeba82dab8b..ec3e447aece 100644 --- a/examples/example-gcp-csm-observability/build.gradle +++ b/examples/example-gcp-csm-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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' def openTelemetryVersion = '1.38.0' def openTelemetryPrometheusVersion = '1.38.0-alpha' diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index d9f2e947211..336c27a68a5 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 0070f9f0f8c..f528aaf96d5 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 ca567e63d0b..5c37393e6d1 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index f47bc0db3ba..15047759a3d 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 7aba7d42e09..127d9d0007b 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 3.25.1 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 65490bf32dc..6bcc6fffffc 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 eae7517dd1a..b16130a9176 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-oauth https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 3.25.1 diff --git a/examples/example-opentelemetry/build.gradle b/examples/example-opentelemetry/build.gradle index c8fccf13059..98541233039 100644 --- a/examples/example-opentelemetry/build.gradle +++ b/examples/example-opentelemetry/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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' def openTelemetryVersion = '1.39.0' def openTelemetryPrometheusVersion = '1.39.0-alpha' diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index e1546b767d1..d5d42b8eb07 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 0be517219ee..076a9bc30a0 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 a591b4574aa..1e36710f2c5 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 e0e13d29b87..12c2d4a27e3 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.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 c8446a1ce41..9d9d920fa49 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 0f406ecff51..7e213dbc808 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.65.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.65.1' // CURRENT_GRPC_VERSION def protocVersion = '3.25.1' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 15210cefe7d..8e688f11dd7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.65.1-SNAPSHOT + 1.65.1 examples https://github.com/grpc/grpc-java UTF-8 - 1.65.1-SNAPSHOT + 1.65.1 3.25.1 3.25.1