From 00ee62f877577f3605d8b8b67c12f37d7c98e805 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Thu, 28 May 2026 11:39:16 -0400 Subject: [PATCH] Update Netty and OkHttp dependencies and resolve test failures (#3066) This commit updates several dependencies in dependencies.gradle and resolves the resulting test failures: - Netty: Updated strict upper bound from <4.2.0 to <5.0.0 (resolved to 4.2.14.Final). - OkHttp: Removed strict upper bound of <5.0.0 and moved to dynamic versions section (resolved to 5.3.2). - Cleaned up dependencies.gradle by moving strict dependencies (secretmanager, common-protos, gax) out of the dynamic versions section. - Updated all gradle.lockfile files. Resulting test fixes: - Netty: Replaced NioEventLoopGroup with DefaultEventLoopGroup in NettyExtension and ProbingStepTest. In Netty 4.2+, LocalServerChannel no longer supports registration with NIO-backed event loops, throwing an IllegalArgumentException. - OkHttp: Refactored ServiceMonitoringClient to safely handle empty responses using Optional.orElse(). In OkHttp 5.x, a 204 No Content response returns a non-null ResponseBody with an empty string, causing an assertion failure where MosApiException was incorrectly bypassed. --- core/gradle.lockfile | 32 +++++++++---------- .../mosapi/ServiceMonitoringClient.java | 4 +-- db/gradle.lockfile | 24 +++++++------- dependencies.gradle | 30 ++++++++--------- jetty/gradle.lockfile | 29 +++++++++-------- load-testing/gradle.lockfile | 20 +++++++----- networking/gradle.lockfile | 20 +++++++----- .../networking/handler/NettyExtension.java | 4 +-- prober/gradle.lockfile | 20 +++++++----- .../monitoring/blackbox/ProbingStepTest.java | 4 +-- proxy/gradle.lockfile | 20 +++++++----- 11 files changed, 110 insertions(+), 97 deletions(-) diff --git a/core/gradle.lockfile b/core/gradle.lockfile index 6a4e4806d..2d583ddfa 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -74,14 +74,13 @@ com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.141.0=compileClasspath,de com.google.api.grpc:proto-google-common-protos:2.60.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-iam-v1:1.60.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:proto-google-iam-v1:1.66.0=testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.57.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.api:api-common:2.63.0=testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.63.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax-grpc:2.74.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api:gax-grpc:2.80.0=testCompileClasspath,testRuntimeClasspath com.google.api:gax-httpjson:2.74.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api:gax-httpjson:2.80.0=testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.74.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20260421-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20260522-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20251012-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-dataflow:v1b3-rev20260503-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -95,13 +94,11 @@ com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileC com.google.apis:google-api-services-monitoring:v3-rev20260129-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20260213-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20260317-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20260510-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20251118-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0=testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.auth:google-auth-library-credentials:1.47.0=testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.47.0=testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=nonprodAnnotationProcessor,testAnnotationProcessor com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor @@ -116,8 +113,8 @@ com.google.cloud.datastore:datastore-v1-proto-client:2.34.0=compileClasspath,dep com.google.cloud.opentelemetry:detector-resources-support:0.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.opentelemetry:exporter-metrics:0.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.opentelemetry:shared-resourcemapping:0.33.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.28.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.28.3=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.28.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.28.4=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:3.21.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.73.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-compute:1.82.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -193,12 +190,13 @@ com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,deploy_jar,nonprod com.ibm.icu:icu4j:73.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.24.0=checkstyle -com.squareup.okhttp3:okhttp:4.12.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp-jvm:5.3.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.3.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio-bom:3.0.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio-fakefilesystem-jvm:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio-fakefilesystem:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.16.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.16.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.wire:wire-compiler:4.5.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.wire:wire-grpc-server-generator:4.5.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.wire:wire-grpc-server:4.5.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -225,7 +223,7 @@ commons-codec:commons-codec:1.19.0=compileClasspath,deploy_jar,nonprodCompileCla commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.20.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -dnsjava:dnsjava:3.6.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +dnsjava:dnsjava:3.6.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0=testRuntimeClasspath guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0=testRuntimeClasspath guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0=testRuntimeClasspath @@ -480,13 +478,13 @@ org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,nonprodRuntimeClasspath,runtime org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.20=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -549,7 +547,7 @@ org.seleniumhq.selenium:selenium-safari-driver:4.44.0=testCompileClasspath,testR org.seleniumhq.selenium:selenium-support:4.44.0=testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.36=testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.17=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.testcontainers:database-commons:1.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/mosapi/ServiceMonitoringClient.java b/core/src/main/java/google/registry/mosapi/ServiceMonitoringClient.java index d066b00d1..bbf463cf9 100644 --- a/core/src/main/java/google/registry/mosapi/ServiceMonitoringClient.java +++ b/core/src/main/java/google/registry/mosapi/ServiceMonitoringClient.java @@ -49,10 +49,10 @@ public class ServiceMonitoringClient { tld, MONITORING_STATE_ENDPOINT, Collections.emptyMap(), Collections.emptyMap())) { ResponseBody responseBody = response.body(); - if (responseBody == null) { + if (responseBody == null || responseBody.contentLength() == 0) { throw new MosApiException( String.format( - "MoSAPI Service Monitoring API " + "returned an empty body with status: %d", + "MoSAPI Service Monitoring API returned an empty body with status: %d", response.code())); } String bodyString = responseBody.string(); diff --git a/db/gradle.lockfile b/db/gradle.lockfile index d498b059e..cd80181ee 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -20,19 +20,19 @@ com.github.jnr:jnr-unixsocket:0.38.25=deploy_jar,runtimeClasspath,testRuntimeCla com.github.jnr:jnr-x86asm:1.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor com.google.api-client:google-api-client:2.9.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.53.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.79.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20260317-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.63.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.80.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20260510-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor -com.google.cloud.sql:jdbc-socket-factory-core:1.28.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.28.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.28.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.28.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.12.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.48.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=checkstyle com.google.errorprone:error_prone_annotations:2.48.0=annotationProcessor,testAnnotationProcessor @@ -57,7 +57,7 @@ com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,deploy_jar,runtimeC com.google.oauth-client:google-oauth-client:1.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:4.33.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:4.33.2=annotationProcessor,testAnnotationProcessor -com.google.protobuf:protobuf-java:4.34.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.truth:truth:1.4.5=testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.24.0=checkstyle commons-beanutils:commons-beanutils:1.10.1=checkstyle @@ -67,12 +67,12 @@ commons-codec:commons-codec:1.19.0=compileClasspath,deploy_jar,runtimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.20.0=compileClasspath,deploy_jar,runtimeClasspath commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -dnsjava:dnsjava:3.6.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +dnsjava:dnsjava:3.6.5=deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.7.7=checkstyle io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.17=testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.70.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.81.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-context:1.70.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -141,7 +141,7 @@ org.postgresql:postgresql:42.7.11=deploy_jar,runtimeClasspath,testRuntimeClasspa org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=compileClasspath,testCompileClasspath -org.slf4j:slf4j-api:2.0.17=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=deploy_jar,runtimeClasspath,testRuntimeClasspath org.testcontainers:database-commons:1.21.4=testCompileClasspath,testRuntimeClasspath org.testcontainers:jdbc:1.21.4=testCompileClasspath,testRuntimeClasspath org.testcontainers:junit-jupiter:1.21.4=testCompileClasspath,testRuntimeClasspath diff --git a/dependencies.gradle b/dependencies.gradle index 7f20d26c3..fa7a07f89 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,17 +40,13 @@ ext { // For SchemaExport 'org.hibernate.orm:hibernate-ant:7.3.4.Final', - // Netty 4.2 is in alpha and causes runtime error. Also note that v5.0 - // seems abandoned (last updated on Maven in 2015). - 'io.netty:netty-codec-http:[4.1.59.Final, 4.2.0)!!', - 'io.netty:netty-codec:[4.1.59.Final, 4.2.0)!!', - 'io.netty:netty-common:[4.1.59.Final, 4.2.0)!!', - 'io.netty:netty-handler:[4.1.59.Final, 4.2.0)!!', - 'io.netty:netty-transport:[4.1.59.Final, 4.2.0)!!', - 'io.netty:netty-buffer:[4.1.59.Final, 4.2.0)!!', - - // OkHttp 5.0 is in alpha. - 'com.squareup.okhttp3:okhttp:[4.10.0, 5.0.0)!!', + // Netty v5.0 seems abandoned (last updated on Maven in 2015). + 'io.netty:netty-codec-http:[4.1.59.Final, 5.0.0)!!', + 'io.netty:netty-codec:[4.1.59.Final, 5.0.0)!!', + 'io.netty:netty-common:[4.1.59.Final, 5.0.0)!!', + 'io.netty:netty-handler:[4.1.59.Final, 5.0.0)!!', + 'io.netty:netty-transport:[4.1.59.Final, 5.0.0)!!', + 'io.netty:netty-buffer:[4.1.59.Final, 5.0.0)!!', // This packages has a broken versioning scheme. There are v1beta3-* and // v1b4-* packages that are way older than v1b3-rev2024MMDD-* that need to @@ -67,17 +63,18 @@ ext { 'com.google.cloud:google-cloud-tasks:[1.33.2,2.52.0)!!', 'com.google.api.grpc:proto-google-cloud-tasks-v2:[1.33.2,2.52.0)!!', - // DYNAMIC VERSIONS START HERE. - 'com.fasterxml.jackson.core:jackson-databind:[2.11.2,2.21.0)', 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.17.2,2.21.0)', + 'com.google.api.grpc:proto-google-cloud-secretmanager-v1:[1.4.0,2.52.0)!!', + 'com.google.api.grpc:proto-google-common-protos:[2.1.0,2.61.0)!!', + 'com.google.api:gax:[1.66.0,2.75.0)!!', + + // DYNAMIC VERSIONS START HERE. + 'com.github.ben-manes.caffeine:caffeine:[3.0.0,)', 'com.google.api-client:google-api-client-java6:[1.31.3,)', 'com.google.api-client:google-api-client-servlet:[1.31.3,)', 'com.google.api-client:google-api-client:[1.31.3,)', - 'com.google.api.grpc:proto-google-cloud-secretmanager-v1:[1.4.0,2.52.0)!!', - 'com.google.api.grpc:proto-google-common-protos:[2.1.0,2.61.0)!!', - 'com.google.api:gax:[1.66.0,2.75.0)!!', 'com.google.apis:google-api-services-admin-directory:[directory_v1-rev20240102-2.0.0,)', 'com.google.apis:google-api-services-bigquery:[v2-rev20240423-2.0.0,)', 'com.google.apis:google-api-services-cloudkms:[v1-rev20240513-2.0.0,)', @@ -124,6 +121,7 @@ ext { 'com.google.re2j:re2j:[1.6,)', 'com.google.truth:truth:[1.1.2,)', 'com.googlecode.json-simple:json-simple:[1.1.1,)', + 'com.squareup.okhttp3:okhttp:[4.10.0,)', 'org.freemarker:freemarker:[2.3.32,)', 'com.ibm.icu:icu4j:[68.2,)', 'com.github.mwiede:jsch:[2.28.2,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index 5825bcd6d..141ff01f3 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -66,11 +66,11 @@ com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.141.0=deploy_jar,runtimeC com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.141.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.60.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-iam-v1:1.60.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.57.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.63.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api:gax-grpc:2.74.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api:gax-httpjson:2.74.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api:gax:2.74.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20260421-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20260522-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20251012-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-dataflow:v1b3-rev20260503-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -84,10 +84,10 @@ com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=deploy_j com.google.apis:google-api-services-monitoring:v3-rev20260129-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20260213-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20260317-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20260510-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20251118-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor com.google.auto.service:auto-service-annotations:1.1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -101,8 +101,8 @@ com.google.cloud.datastore:datastore-v1-proto-client:2.34.0=deploy_jar,runtimeCl com.google.cloud.opentelemetry:detector-resources-support:0.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.opentelemetry:exporter-metrics:0.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.opentelemetry:shared-resourcemapping:0.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.28.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.28.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.28.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.28.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:3.21.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.73.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-compute:1.82.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -162,12 +162,13 @@ com.googlecode.json-simple:json-simple:1.1.1=deploy_jar,runtimeClasspath,testRun com.ibm.icu:icu4j:73.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.24.0=checkstyle -com.squareup.okhttp3:okhttp:4.12.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp-jvm:5.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio-bom:3.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio-fakefilesystem-jvm:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio-fakefilesystem:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.16.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.16.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.wire:wire-compiler:4.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.wire:wire-grpc-server-generator:4.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup.wire:wire-grpc-server:4.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -189,7 +190,7 @@ commons-codec:commons-codec:1.19.0=deploy_jar,runtimeClasspath,testRuntimeClassp commons-collections:commons-collections:3.2.2=checkstyle commons-io:commons-io:2.20.0=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -dnsjava:dnsjava:3.6.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +dnsjava:dnsjava:3.6.5=deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.7.7=checkstyle io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=deploy_jar,runtimeClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -356,10 +357,10 @@ org.jboss.logging:jboss-logging:3.6.3.Final=deploy_jar,runtimeClasspath,testRunt org.jcommander:jcommander:2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -385,7 +386,7 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor org.postgresql:postgresql:42.7.11=deploy_jar,runtimeClasspath,testRuntimeClasspath org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.18=deploy_jar,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.17=deploy_jar,runtimeClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.testcontainers:database-commons:1.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/load-testing/gradle.lockfile b/load-testing/gradle.lockfile index d08a84670..a66487062 100644 --- a/load-testing/gradle.lockfile +++ b/load-testing/gradle.lockfile @@ -31,14 +31,18 @@ commons-collections:commons-collections:3.2.2=checkstyle info.picocli:picocli:4.7.7=checkstyle io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor -io.netty:netty-buffer:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-compression:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:12.5=checkstyle org.antlr:antlr4-runtime:4.13.2=checkstyle diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 57089825b..05e2a167b 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -90,16 +90,20 @@ io.grpc:grpc-services:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-stub:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-util:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-compression:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.77.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.77.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/networking/src/test/java/google/registry/networking/handler/NettyExtension.java b/networking/src/test/java/google/registry/networking/handler/NettyExtension.java index 649bb8958..a816612aa 100644 --- a/networking/src/test/java/google/registry/networking/handler/NettyExtension.java +++ b/networking/src/test/java/google/registry/networking/handler/NettyExtension.java @@ -32,11 +32,11 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInitializer; +import io.netty.channel.DefaultEventLoopGroup; import io.netty.channel.EventLoopGroup; import io.netty.channel.local.LocalAddress; import io.netty.channel.local.LocalChannel; import io.netty.channel.local.LocalServerChannel; -import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.ReferenceCountUtil; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -54,7 +54,7 @@ public final class NettyExtension implements AfterEachCallback { // All I/O operations are done inside the single thread within this event loop group, which is // different from the main test thread. Therefore synchronizations are required to make sure that // certain I/O activities are finished when assertions are performed. - private final EventLoopGroup eventLoopGroup = new NioEventLoopGroup(1); + private final EventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1); // Handler attached to server's channel to record the request received. private EchoHandler echoHandler; diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index 014c5bd6f..492bec8da 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -94,16 +94,20 @@ io.grpc:grpc-services:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-stub:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-util:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.68.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-compression:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.77.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.77.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java index ff15cae77..7d470f593 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java @@ -34,11 +34,11 @@ import google.registry.networking.handler.NettyExtension; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; +import io.netty.channel.DefaultEventLoopGroup; import io.netty.channel.EventLoopGroup; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.local.LocalAddress; import io.netty.channel.local.LocalChannel; -import io.netty.channel.nio.NioEventLoopGroup; import java.time.Duration; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -58,7 +58,7 @@ class ProbingStepTest { private static final String TEST_MESSAGE = "TEST_MESSAGE"; private static final String SECONDARY_TEST_MESSAGE = "SECONDARY_TEST_MESSAGE"; private static final LocalAddress address = new LocalAddress(ADDRESS_NAME); - private final EventLoopGroup eventLoopGroup = new NioEventLoopGroup(1); + private final EventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(1); private final Bootstrap bootstrap = new Bootstrap().group(eventLoopGroup).channel(LocalChannel.class); diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index f10dfd3a0..212e28947 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -114,16 +114,20 @@ io.grpc:grpc-services:1.70.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-stub:1.70.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-util:1.70.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.70.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-compression:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.77.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.77.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.134.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.14.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath