diff --git a/docstore-metrics/gradle.lockfile b/docstore-metrics/gradle.lockfile index 1e93fda..4d58d70 100644 --- a/docstore-metrics/gradle.lockfile +++ b/docstore-metrics/gradle.lockfile @@ -23,7 +23,7 @@ io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -33,32 +33,33 @@ io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeCl io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-collections4:4.4=runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.18.0=runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-pool2:2.10.0=runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.documentstore:document-store:0.9.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath org.mongodb:bson:5.2.0=runtimeClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-sync:5.2.0=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.11=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath -org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath empty= diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0409e1d..422f540 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ caffeine = "3.1.8" [libraries] awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" } -jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.0" } +jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } dropwizard-metrics-jakarta-servlet = { module = "io.dropwizard.metrics:metrics-jakarta-servlet", version.ref = "dropwizard-metrics" } dropwizard-metrics-jakarta-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", version.ref = "dropwizard-metrics" } dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" } diff --git a/integrationtest-service-framework/gradle.lockfile b/integrationtest-service-framework/gradle.lockfile index 2ff188a..df87a9f 100644 --- a/integrationtest-service-framework/gradle.lockfile +++ b/integrationtest-service-framework/gradle.lockfile @@ -27,7 +27,7 @@ io.micrometer:micrometer-commons:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-core:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -37,24 +37,25 @@ io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeCl io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=runtimeClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.awaitility:awaitility:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath empty=annotationProcessor diff --git a/platform-grpc-service-framework/gradle.lockfile b/platform-grpc-service-framework/gradle.lockfile index 7d3fd41..d2620b0 100644 --- a/platform-grpc-service-framework/gradle.lockfile +++ b/platform-grpc-service-framework/gradle.lockfile @@ -46,18 +46,18 @@ io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-socks:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler-proxy:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -68,27 +68,28 @@ io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeCl io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.23=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-server-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath -org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath empty= diff --git a/platform-http-service-framework/gradle.lockfile b/platform-http-service-framework/gradle.lockfile index ae780ce..f45b179 100644 --- a/platform-http-service-framework/gradle.lockfile +++ b/platform-http-service-framework/gradle.lockfile @@ -45,7 +45,7 @@ io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -57,27 +57,28 @@ io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClas io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlets:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.23=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath -org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty= diff --git a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java index 9bc4293..2d83d50 100644 --- a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java +++ b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java @@ -17,6 +17,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.annotation.Nullable; +import org.eclipse.jetty.ee10.servlet.ErrorHandler; +import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlets.CrossOriginFilter; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; @@ -24,12 +30,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.server.handler.ErrorHandler; -import org.eclipse.jetty.servlet.ErrorPageErrorHandler; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlets.CrossOriginFilter; import org.hypertrace.core.serviceframework.http.HttpContainer; import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition; import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition.CorsConfig; @@ -106,7 +106,6 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) { : ServletContextHandler.NO_SESSIONS; ServletContextHandler context = new ServletContextHandler(options); ErrorHandler errorHandler = new ErrorPageErrorHandler(); - errorHandler.setShowServlet(false); errorHandler.setShowStacks(false); context.setErrorHandler(errorHandler); this.buildCorsFilterIfRequired(handlerDefinition.getCorsConfig()) @@ -128,7 +127,7 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) { this.buildServletHolderIfRequired(handlerDefinition) .ifPresent( servletHolder -> context.addServlet(servletHolder, handlerDefinition.getContextPath())); - context.setVirtualHosts(new String[] {"@" + handlerDefinition.getName()}); + context.setVirtualHosts(List.of("@" + handlerDefinition.getName())); return context; } diff --git a/platform-hybrid-service-framework/gradle.lockfile b/platform-hybrid-service-framework/gradle.lockfile index 42628c1..3daa294 100644 --- a/platform-hybrid-service-framework/gradle.lockfile +++ b/platform-hybrid-service-framework/gradle.lockfile @@ -50,18 +50,18 @@ io.micrometer:micrometer-commons:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-core:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=runtimeClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.132.Final=runtimeClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.132.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-codec-socks:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-handler-proxy:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.133.Final=runtimeClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.133.Final=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -73,29 +73,30 @@ io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClas io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlets:11.0.26=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.23=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-server-utils:0.13.23=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath -org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath empty= diff --git a/platform-metrics/gradle.lockfile b/platform-metrics/gradle.lockfile index 105a8cc..775c9ea 100644 --- a/platform-metrics/gradle.lockfile +++ b/platform-metrics/gradle.lockfile @@ -21,7 +21,7 @@ io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_dropwizard:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -31,7 +31,7 @@ io.prometheus:simpleclient_servlet_jakarta:0.16.0=compileClasspath,runtimeClassp io.prometheus:simpleclient_tracer_common:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.4=testRuntimeClasspath @@ -40,16 +40,17 @@ org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4=testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.33.0=runtimeClasspath org.checkerframework:checker-qual:3.37.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath @@ -62,6 +63,5 @@ org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath -org.slf4j:slf4j-api:2.0.17=testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/platform-service-framework/gradle.lockfile b/platform-service-framework/gradle.lockfile index 1b4ba69..7d0e8e0 100644 --- a/platform-service-framework/gradle.lockfile +++ b/platform-service-framework/gradle.lockfile @@ -29,7 +29,7 @@ io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_common:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ io.prometheus:simpleclient_servlet_jakarta:0.16.0=compileClasspath,runtimeClassp io.prometheus:simpleclient_tracer_common:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.prometheus:simpleclient_tracer_otel_agent:0.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,16 +49,17 @@ org.apache.logging.log4j:log4j-core:2.25.4=testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath @@ -76,6 +77,5 @@ org.osgi:org.osgi.annotation.bundle:2.0.0=testCompileClasspath org.osgi:org.osgi.annotation.versioning:1.1.2=testCompileClasspath org.osgi:org.osgi.resource:1.0.0=testCompileClasspath org.osgi:org.osgi.service.serviceloader:1.0.0=testCompileClasspath -org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java b/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java index c5ef331..d3937ff 100644 --- a/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java +++ b/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java @@ -8,9 +8,9 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.net.UnknownHostException; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.hypertrace.core.serviceframework.config.ConfigClient; import org.hypertrace.core.serviceframework.config.ConfigClientFactory; import org.hypertrace.core.serviceframework.metrics.PlatformMetricsRegistry; diff --git a/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java b/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java index eae4744..d5d4f01 100644 --- a/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java +++ b/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java @@ -1,11 +1,11 @@ package org.hypertrace.core.serviceframework.service.servlets; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.http.HttpTester.Request; import org.eclipse.jetty.http.HttpTester.Response; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.servlet.ServletTester; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/service-framework-spi/gradle.lockfile b/service-framework-spi/gradle.lockfile index a76a6d3..e7b9e13 100644 --- a/service-framework-spi/gradle.lockfile +++ b/service-framework-spi/gradle.lockfile @@ -3,8 +3,9 @@ # This file is expected to be part of source control. com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.79=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/settings.gradle.kts b/settings.gradle.kts index 436afea..0d2e799 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ plugins { } configure { - catalogVersion.set("0.3.72") + catalogVersion.set("0.3.79") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")