diff --git a/README.md b/README.md index 853b37e8c6a..0e25ca28534 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ For a guided tour, take a look at the [quick start guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC basics](https://grpc.io/docs/languages/java/basics). -The [examples](https://github.com/grpc/grpc-java/tree/v1.43.0/examples) and the -[Android example](https://github.com/grpc/grpc-java/tree/v1.43.0/examples/android) +The [examples](https://github.com/grpc/grpc-java/tree/v1.43.1/examples) and the +[Android example](https://github.com/grpc/grpc-java/tree/v1.43.1/examples/android) are standalone projects that showcase the usage of gRPC. Download @@ -43,17 +43,17 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`: io.grpc grpc-netty-shaded - 1.43.0 + 1.43.1 io.grpc grpc-protobuf - 1.43.0 + 1.43.1 io.grpc grpc-stub - 1.43.0 + 1.43.1 org.apache.tomcat @@ -65,23 +65,23 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`: Or for Gradle with non-Android, add to your dependencies: ```gradle -implementation 'io.grpc:grpc-netty-shaded:1.43.0' -implementation 'io.grpc:grpc-protobuf:1.43.0' -implementation 'io.grpc:grpc-stub:1.43.0' +implementation 'io.grpc:grpc-netty-shaded:1.43.1' +implementation 'io.grpc:grpc-protobuf:1.43.1' +implementation 'io.grpc:grpc-stub:1.43.1' compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+ ``` For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and `grpc-protobuf-lite` instead of `grpc-protobuf`: ```gradle -implementation 'io.grpc:grpc-okhttp:1.43.0' -implementation 'io.grpc:grpc-protobuf-lite:1.43.0' -implementation 'io.grpc:grpc-stub:1.43.0' +implementation 'io.grpc:grpc-okhttp:1.43.1' +implementation 'io.grpc:grpc-protobuf-lite:1.43.1' +implementation 'io.grpc:grpc-stub:1.43.1' compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+ ``` [the JARs]: -https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.43.0 +https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.43.1 Development snapshots are available in [Sonatypes's snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/). @@ -113,7 +113,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use com.google.protobuf:protoc:3.19.1:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.43.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.43.1:exe:${os.detected.classifier} @@ -143,7 +143,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' + artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' } } generateProtoTasks { @@ -176,7 +176,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' + artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' } } generateProtoTasks { diff --git a/build.gradle b/build.gradle index 02ebb792e23..debf810e277 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.43.0" // CURRENT_GRPC_VERSION + version = "1.43.1" // CURRENT_GRPC_VERSION repositories { maven { // The google mirror is less flaky than mavenCentral() @@ -148,7 +148,7 @@ subprojects { errorprone: "com.google.errorprone:error_prone_annotations:2.9.0", cronet_api: 'org.chromium.net:cronet-api:92.4515.131', cronet_embedded: 'org.chromium.net:cronet-embedded:92.4515.131', - gson: "com.google.code.gson:gson:2.8.6", + gson: "com.google.code.gson:gson:2.8.9", guava: "com.google.guava:guava:${guavaVersion}", javax_annotation: 'org.apache.tomcat:annotations-api:6.0.53', jsr305: 'com.google.code.findbugs:jsr305:3.0.2', diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index b54976b9623..0b3da8e06bd 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.43.0)", + value = "by gRPC proto compiler (version 1.43.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 f54aa6e037c..b026b27a511 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.43.0)", + value = "by gRPC proto compiler (version 1.43.1)", 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 f7e381181c1..6c705fe3321 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.43.0)", + value = "by gRPC proto compiler (version 1.43.1)", 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 4fa8ca2bcad..4fcacc184b8 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.43.0)", + value = "by gRPC proto compiler (version 1.43.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 f19d92dee66..659de6cee7a 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -205,7 +205,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.43.0"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.43.1"; // CURRENT_GRPC_VERSION /** * The default timeout in nanos for a keepalive ping request. diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 2e079078fc7..601c7740ca4 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -349,6 +349,9 @@ private class IdleModeTimer implements Runnable { @Override public void run() { + if (lbHelper == null) { + return; + } enterIdleMode(); } } diff --git a/cronet/README.md b/cronet/README.md index e7705acc3de..d53da56a8d7 100644 --- a/cronet/README.md +++ b/cronet/README.md @@ -26,7 +26,7 @@ In your app module's `build.gradle` file, include a dependency on both `grpc-cro Google Play Services Client Library for Cronet ``` -implementation 'io.grpc:grpc-cronet:1.43.0' +implementation 'io.grpc:grpc-cronet:1.43.1' implementation 'com.google.android.gms:play-services-cronet:16.0.0' ``` diff --git a/documentation/android-channel-builder.md b/documentation/android-channel-builder.md index 3ebbf9522a4..09c0bef179a 100644 --- a/documentation/android-channel-builder.md +++ b/documentation/android-channel-builder.md @@ -36,8 +36,8 @@ In your `build.gradle` file, include a dependency on both `grpc-android` and `grpc-okhttp`: ``` -implementation 'io.grpc:grpc-android:1.43.0' -implementation 'io.grpc:grpc-okhttp:1.43.0' +implementation 'io.grpc:grpc-android:1.43.1' +implementation 'io.grpc:grpc-okhttp:1.43.1' ``` You also need permission to access the device's network state in your diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle index 14110cd85c4..35106172427 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.19.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' // 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.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.43.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.43.1' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' testImplementation 'junit:junit:4.12' testImplementation 'com.google.truth:truth:1.0.1' - testImplementation 'io.grpc:grpc-testing:1.43.0' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.43.1' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index e869ffeed65..a459d859241 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.19.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' // 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.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.43.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.43.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 3ea4223db27..b0284f19a85 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.19.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' // 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.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.43.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.43.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 4a6893192e6..11a14d1274d 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.19.1' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.0' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.43.1' // 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.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.43.0' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.43.0' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.43.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.43.1' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 05dc01743bb..8c5403ccaca 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.19.1' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 27a926c0d7f..324e77b4a98 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protocVersion = '3.19.1' dependencies { diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 0ed445ff5a4..6518d040688 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.19.1' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 39436678a63..6cd6cecc2c5 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.43.0 + 1.43.1 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.43.0 + 1.43.1 3.19.1 1.7 diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index f6727f9d6a0..cf9d85da302 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.19.1' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 989e275e986..6c5584daac2 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.43.0 + 1.43.1 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.43.0 + 1.43.1 3.19.1 1.7 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 621fff1d667..42a3ce6cc18 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protobufVersion = '3.19.1' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index cd5673797c1..0a4397d92cb 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.43.0 + 1.43.1 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.43.0 + 1.43.1 3.19.1 3.19.1 diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 884eae41b02..d41c1188c0c 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def protocVersion = '3.19.1' dependencies { diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 1668dc4acf0..c9b35fcd523 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.43.0 + 1.43.1 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.43.0 + 1.43.1 3.19.1 2.0.34.Final diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 50953d3e06a..f9f9052e8a9 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.43.0' // CURRENT_GRPC_VERSION +def grpcVersion = '1.43.1' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.31.Final' def protocVersion = '3.19.1' diff --git a/examples/pom.xml b/examples/pom.xml index ab5ad3d9b2b..2a7279c52cb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.43.0 + 1.43.1 examples https://github.com/grpc/grpc-java UTF-8 - 1.43.0 + 1.43.1 3.19.1 3.19.1 @@ -51,6 +51,11 @@ protobuf-java-util ${protobuf.version} + + com.google.code.gson + gson + 2.8.9 + org.apache.tomcat annotations-api diff --git a/repositories.bzl b/repositories.bzl index 712e34fded0..6e9caf9409d 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -15,7 +15,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.auth:google-auth-library-credentials:0.22.0", "com.google.auth:google-auth-library-oauth2-http:0.22.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:jar:2.8.6", + "com.google.code.gson:gson:jar:2.8.9", "com.google.auto.value:auto-value:1.7.4", "com.google.auto.value:auto-value-annotations:1.7.4", "com.google.errorprone:error_prone_annotations:2.9.0",