Upgrade dependencies for 1.25.0

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);
                 }

dependencies.toml

@@ -17,35 +17,35 @@ cglib = "3.3.0"
 checkerframework = "2.5.5"
 checkstyle = "10.3.2"
 curator = "5.5.0"
-dagger = "2.46.1"
-dgs = "5.5.0"
+dagger = "2.47"
+dgs = "7.3.6"
 dropwizard1 = "1.3.29"
 dropwizard2 = "2.1.6"
 dropwizard-metrics = "4.2.19"
-errorprone = "2.19.1"
+errorprone = "2.20.0"
 errorprone-gradle-plugin = "3.1.0"
-eureka = "2.0.0"
+eureka = "2.0.1"
 fastutil = "8.5.12"
 finagle = "22.12.0"
 findbugs = "3.0.2"
 futures-completable = "0.3.5"
 futures-extra = "4.3.1"
-gax-grpc = "2.29.0"
+gax-grpc = "2.31.1"
 graphql-java = "20.4"
-graphql-kotlin = "6.5.2"
-grpc-java = "1.56.0"
+graphql-kotlin = "6.5.3"
+grpc-java = "1.57.1"
 grpc-kotlin = "1.3.0"
 guava = "32.0.1-jre"
 hamcrest = "2.2"
 hbase = "1.2.6"
 hibernate-validator6 = "6.2.5.Final"
-hibernate-validator8 = "8.0.0.Final"
+hibernate-validator8 = "8.0.1.Final"
 j2objc = "2.8"
 jackson = "2.15.2"
 jakarta-inject = "2.0.1"
 jakarta-validation = "3.0.2"
-jakarta-websocket= "2.1.0"
-java-websocket = "1.5.3"
+jakarta-websocket= "2.1.1"
+java-websocket = "1.5.4"
 javax-annotation = "1.3.2"
 javax-inject = "1"
 javax-jsr311 = "1.1.1"
@@ -67,22 +67,22 @@ joor = "0.9.14"
 json-unit = "2.38.0"
 jsoup = "1.16.1"
 junit4 = "4.13.2"
-junit5 = "5.9.3"
+junit5 = "5.10.0"
 junit-pioneer = "1.9.1"
 jwt = "4.4.0"
-kafka = "3.4.1"
-kotlin = "1.8.22"
-kotlin-coroutine = "1.7.1"
-ktlint-gradle-plugin = "11.4.0"
+kafka = "3.5.1"
+kotlin = "1.9.0"
+kotlin-coroutine = "1.7.3"
+ktlint-gradle-plugin = "11.5.0"
 logback12 = "1.2.11"
 logback13 = "1.3.8"
 logback14 = "1.4.8"
-micrometer = "1.11.1"
+micrometer = "1.11.2"
 micrometer13 = "1.3.20"
 mockito = "4.11.0"
 monix = "3.4.1"
 munit = "0.7.29"
-netty = "4.1.95.Final"
+netty = "4.1.96.Final"
 netty-incubator-transport-native-io_uring = "0.0.21.Final"
 nexus-publish = "1.3.0"
 node-gradle-plugin = "5.0.0"
@@ -93,24 +93,24 @@ 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"
 reactive-streams = "1.0.4"
-reactor = "3.5.7"
+reactor = "3.5.8"
 reactor-kotlin = "1.2.2"
 reflections = "0.9.11"
-resilience4j = "2.0.2"
-resteasy = "5.0.5.Final"
+resilience4j = "2.1.0"
+resteasy = "5.0.7.Final"
 resteasy-jboss-logging = "3.4.3.Final"
 resteasy-jboss-logging-annotations = "2.2.1.Final"
 retrofit2 = "2.9.0"
 rxjava2 = "2.2.21"
 rxjava3 = "3.1.6"
-sangria = "4.0.0"
+sangria = "4.0.1"
 sangria-slowlog = "3.0.0"
-scala-collection-compat = "2.10.0"
+scala-collection-compat = "2.11.0"
 scala-java8-compat = "1.0.2"
 scala212 = "2.12.18"
 scala213 = "2.13.11"
@@ -120,14 +120,14 @@ scalapb = "0.11.13"
 scalapb-json = "0.12.1"
 shadow-gradle-plugin = "7.1.2"
 shibboleth-utilities = "7.5.2"
-snappy = "1.1.9.1"
+snappy = "1.1.10.3"
 slf4j = "1.7.36"
 slf4j2 = "2.0.7"
-spring6 = "6.0.9"
-spring-boot2 = "2.7.12"
-spring-boot3 = "3.1.0"
+spring6 = "6.0.11"
+spring-boot2 = "2.7.14"
+spring-boot3 = "3.1.2"
 testcontainers = "1.18.3"
-testng = "7.5"
+testng = "7.5.1"
 thrift09 = { strictly = "0.9.3-1" }
 thrift012 = { strictly = "0.12.0" }
 thrift013 = { strictly = "0.13.0" }
@@ -138,9 +138,9 @@ thrift017 = { strictly = "0.17.0" }
 thrift018 = { strictly = "0.18.1" }
 tomcat8 = "8.5.85"
 tomcat9 = "9.0.71"
-tomcat10 = "10.1.10"
+tomcat10 = "10.1.11"
 xml-apis = "1.4.01"
-zookeeper = "3.7.1"
+zookeeper = "3.8.2"
 zookeeper-junit = "1.2"
 
 [boms]
@@ -404,6 +404,7 @@ version.ref = "futures-extra"
 module = "com.google.api:gax-grpc"
 version.ref = "gax-grpc"
 
+# graphql-java requires java11 from 21.0
 [libraries.graphql-java]
 module = "com.graphql-java:graphql-java"
 version.ref = "graphql-java"
@@ -662,6 +663,7 @@ version.ref = "jmh-extras"
 module = "org.jooq:joor"
 version.ref = "joor"
 
+# json-unit 3.0.0 requires java17
 [libraries.json-unit]
 module = "net.javacrumbs.json-unit:json-unit"
 version.ref = "json-unit"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle

@@ -127,7 +127,7 @@ includeWithFlags ':benchmarks:jmh',                            'java', 'kotlin'
 includeWithFlags ':benchmarks:ghz',                            'java'
 includeWithFlags ':it:builders',                               'java'
 includeWithFlags ':it:context-storage',                        'java'
-includeWithFlags ':it:dgs',                                    'java'
+includeWithFlags ':it:dgs',                                    'java17'
 includeWithFlags ':it:flags-cyclic-dep',                       'java'
 includeWithFlags ':it:graphql-multipart',                      'java17'
 includeWithFlags ':it:grpcweb',                                'java', 'akka-grpc_2.13'