From 558b5b0bfac8e21755c223063274a779b3898afe Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 13 Jun 2023 15:39:30 -0700 Subject: [PATCH] Bump version to 1.56.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-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 ++-- 28 files changed, 47 insertions(+), 47 deletions(-) diff --git a/build.gradle b/build.gradle index ed4baab82eb..014411fba14 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.56.0" // CURRENT_GRPC_VERSION + version = "1.56.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 418d8f9b5a6..39fe85aea4a 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.56.0)", + value = "by gRPC proto compiler (version 1.56.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 61be9c09f81..2f13e4a7392 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.56.0)", + value = "by gRPC proto compiler (version 1.56.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 17241ef5d23..fb545903371 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.56.0)", + value = "by gRPC proto compiler (version 1.56.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 396c7844485..586afe97054 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.56.0)", + value = "by gRPC proto compiler (version 1.56.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 59491798604..2d8e21c2fd2 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -218,7 +218,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.56.0"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.56.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 7b957d3af41..357a2e14e89 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -54,12 +54,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.56.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.56.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.56.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index d9ea7483861..81d43ec24b3 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.56.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.56.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 c03c4de0bd1..c7dc13aa6c4 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.56.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.56.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 2ad56e4f6c2..475c6bfbeb9 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.22.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -53,8 +53,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.56.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.56.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.56.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 077e8031cea..f8cb37338b5 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 43b9657f36b..30cbb6cee26 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index 8bb3dc42cf2..513dc849766 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 43121724b56..b9f5122fcb6 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT example-debug https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 86fb939be75..ea7c6916271 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 2c7f3ae9298..3efd7f2128d 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index d7a3e766d13..ac6289b6c7a 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -24,7 +24,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 5d066f79174..a7fbea5ffca 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index a355d4ec98c..544c8a8eadb 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index a7c0d29f588..b67b5356f1f 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.22.3' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 2199cac8c26..f60fcd23a4e 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 3.22.3 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 22e6f9bf1e4..895c99d0c46 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -17,7 +17,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index 8b8ee6b9f2d..c2da16d9763 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -17,7 +17,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 24331e0135e..f3666b125d9 100644 --- a/examples/example-servlet/build.gradle +++ b/examples/example-servlet/build.gradle @@ -15,7 +15,7 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -def grpcVersion = '1.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index dc66da9adf9..386074847f1 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 251d35ba053..4fdb93f869a 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT example-tls https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index a81c50cd2da..5ee162bbd83 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.8 // 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.56.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.56.1-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.22.3' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index 61827aa9640..18491a52f5b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.56.0 + 1.56.1-SNAPSHOT examples https://github.com/grpc/grpc-java UTF-8 - 1.56.0 + 1.56.1-SNAPSHOT 3.22.3 3.22.3