diff options
author | larry-safran <lsafran@google.com> | 2023-12-19 17:14:43 -0800 |
---|---|---|
committer | larry-safran <lsafran@google.com> | 2023-12-19 17:14:43 -0800 |
commit | 8b247598def25451e57da963343ac40e42a0403e (patch) | |
tree | 103a722628b468097aa6b7d76525873849ec6a82 | |
parent | 09952f19d88b659ab3d61c9dfc74cafb52d3e8a0 (diff) | |
download | grpc-grpc-java-8b247598def25451e57da963343ac40e42a0403e.tar.gz |
Bump version to 1.60.2-SNAPSHOT
26 files changed, 46 insertions, 46 deletions
diff --git a/build.gradle b/build.gradle index 4baa7aa32..1adde3114 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.60.1" // CURRENT_GRPC_VERSION + version = "1.60.2-SNAPSHOT" // CURRENT_GRPC_VERSION repositories { maven { // The google mirror is less flaky than mavenCentral() diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index 8451cf0a8..44bce638d 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 final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - public static final String IMPLEMENTATION_VERSION = "1.60.1"; // CURRENT_GRPC_VERSION + public static final String IMPLEMENTATION_VERSION = "1.60.2-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 e5fdcef4d..d0288fb3e 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.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2-SNAPSHOT' // 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.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION + 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 '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.1' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index d0deab5eb..ac1bd8fda 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.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2-SNAPSHOT' // 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.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION + 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 '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 9a9cfbdbb..77326c8b9 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.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2-SNAPSHOT' // 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.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION + 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 '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 aa3f561a1..d93be5a60 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.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.2-SNAPSHOT' // 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.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION + 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 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 0ca11196d..dfa630143 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // 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 808bbfc86..73487f294 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index ceee95167..34236ec25 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 3e91606a3..6da52168c 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-debug</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protoc.version>3.24.0</protoc.version> <!-- required for jdk9 --> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 7a2c80d76..e8a53ec92 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // 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 d33175591..ca9dfaa7e 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-gauth</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.24.0</protobuf.version> <!-- required for jdk9 --> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index 978561342..ccd5508c6 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index b440ce431..29d8f0386 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.24.0' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 09ee1ee24..afab7cd75 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-hostname</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protoc.version>3.24.0</protoc.version> <!-- required for jdk9 --> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index b7a06ae8a..90f179486 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // 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 8ef597ca2..0a583da85 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-jwt-auth</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.24.0</protobuf.version> <protoc.version>3.24.0</protoc.version> <!-- required for jdk9 --> diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index c6b5651ce..3d4a9b50c 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // 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 7f74f61bc..e5baa0aaf 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -7,13 +7,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-oauth</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.24.0</protobuf.version> <protoc.version>3.24.0</protoc.version> <!-- required for jdk9 --> diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 9f18eb829..0fe6a99b4 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index f1bc44fb9..79642dcf3 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index b6e3180d6..c482ecfdc 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 2cc243af3..0be1652bf 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 75a3de968..f562afee7 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>example-tls</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protoc.version>3.24.0</protoc.version> <!-- required for jdk9 --> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index ef987e3ae..08ab67e5a 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.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.60.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.24.0' dependencies { diff --git a/examples/pom.xml b/examples/pom.xml index cb2ed9af0..1d80e68bd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ <packaging>jar</packaging> <!-- Feel free to delete the comment at the end of these lines. It is just for safely updating the version in our release process. --> - <version>1.60.1</version><!-- CURRENT_GRPC_VERSION --> + <version>1.60.2-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <name>examples</name> <url>https://github.com/grpc/grpc-java</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION --> + <grpc.version>1.60.2-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <protobuf.version>3.24.0</protobuf.version> <protoc.version>3.24.0</protoc.version> <!-- required for JDK 8 --> |