upgrade grpc, address comment by @ikhoon

line · Aug 2, 2023 · 7e776c1 · 7e776c1
1 parent 3f3aa63
commit 7e776c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/java/com/linecorp/armeria/client/AbstractDnsResolverBuilder.java b/core/src/main/java/com/linecorp/armeria/client/AbstractDnsResolverBuilder.java
@@ -527,8 +527,7 @@ protected final Consumer<DnsNameResolverBuilder> buildConfigurator(EventLoopGrou
                 builder.queryTimeoutMillis(queryTimeoutMillisForEachAttempt);
             } else {
                 if (queryTimeoutMillis == 0 || queryTimeoutMillis == Long.MAX_VALUE) {
-                    // Use 0 to disable the timeout once https://github.com/netty/netty/pull/13505 is merged.
-                    builder.queryTimeoutMillis(3600000); // 1 hour
+                    builder.queryTimeoutMillis(0);
                 } else {
                     builder.queryTimeoutMillis(queryTimeoutMillis);
                 }

diff --git a/dependencies.toml b/dependencies.toml
@@ -35,7 +35,7 @@ gax-grpc = "2.31.1"
 graphql-java = "20.4"
 graphql-kotlin = "6.5.3"
 groovy = "3.0.18"
-grpc-java = "1.56.1"
+grpc-java = "1.57.1"
 grpc-kotlin = "1.3.0"
 guava = "32.0.1-jre"
 hamcrest = "2.2"
@@ -94,7 +94,7 @@ opensaml = "3.4.6"
 osdetector = "1.7.3"
 proguard = "7.3.1"
 prometheus = "0.16.0"
-protobuf = "3.22.3"
+protobuf = "3.23.4"
 protobuf-gradle-plugin = "0.8.19"
 protobuf-jackson = "2.2.0"
 reactive-grpc = "1.2.4"