Skip to content

Commit 6d60ebd

Browse files
sidharth-jain23sidharth-jain23
authored
chore: upgrade Jetty from 11.0.26 to 12.0.33 (ee10) to fix CVEs (#144)
Migrate from Jetty 11 to Jetty 12 using ee10 servlet compatibility layer: - Add Jetty 12.0.33 ee10 dependencies to local version catalog - Switch build scripts from commonLibs.jetty.* to localLibs.jetty.ee10.* - Update servlet imports from o.e.j.servlet.* to o.e.j.ee10.servlet.* - Update servlets imports from o.e.j.servlets.* to o.e.j.ee10.servlets.* - Fix setVirtualHosts(String[]) to setVirtualHosts(List<String>) - Fix ErrorPageErrorHandler type (no longer extends ErrorHandler in Jetty 12) - Override jetty-bom to 12.0.33 via api(platform()) to propagate to consumers - Regenerate all gradle lock files Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> AI-Session-Id: 8f5c969e-486a-4c9e-8229-95b5363e598d AI-Tool: claude-code AI-Model: unknown
1 parent 4e010fa commit 6d60ebd

File tree

16 files changed

+99
-92
lines changed

16 files changed

+99
-92
lines changed

‎build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ subprojects {
2222
apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId)
2323
}
2424
}
25+
pluginManager.withPlugin("java-library") {
26+
dependencies {
27+
"api"(platform(rootProject.localLibs.jetty.bom))
28+
}
29+
}
2530
}
2631

2732
dependencyCheck {

‎docstore-metrics/gradle.lockfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath
4040
org.apache.commons:commons-lang3:3.18.0=runtimeClasspath,testRuntimeClasspath
4141
org.apache.commons:commons-pool2:2.10.0=runtimeClasspath,testRuntimeClasspath
4242
org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43-
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
44-
org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
46-
org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
47-
org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
48-
org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
49-
org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
50-
org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
43+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
44+
org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
46+
org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
47+
org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
48+
org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
49+
org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
50+
org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
5151
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
52-
org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
52+
org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5353
org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5454
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5555
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
@@ -59,6 +59,6 @@ org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath
5959
org.mongodb:mongodb-driver-sync:5.2.0=runtimeClasspath,testRuntimeClasspath
6060
org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath
6161
org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
62-
org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
62+
org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
6363
org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
6464
empty=

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dropwizard-metrics = "4.2.25"
33
micrometer = "1.14.4"
44
prometheus-simpleclient = "0.16.0"
55
caffeine = "3.1.8"
6+
jetty = "12.0.33"
67

78
[libraries]
89
awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" }
@@ -18,6 +19,10 @@ prometheus-simpleclient-servlet-jakarta = { module = "io.prometheus:simpleclient
1819
prometheus-simpleclient-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus-simpleclient" }
1920
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
2021
apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" }
22+
jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
23+
jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
24+
jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" }
25+
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
2126

2227
[plugins]
2328
hypertrace-java-convention = { id = "org.hypertrace.java-convention", version = "0.4.0" }

‎integrationtest-service-framework/gradle.lockfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
4242
org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
4343
org.awaitility:awaitility:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath
45-
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
46-
org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47-
org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
48-
org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
49-
org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
50-
org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
51-
org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
52-
org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
45+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
46+
org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
48+
org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
49+
org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
50+
org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
51+
org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
52+
org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
5353
org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5454
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
55-
org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
55+
org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5656
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5757
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
58-
org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
58+
org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
5959
org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
6060
empty=annotationProcessor

‎platform-grpc-service-framework/gradle.lockfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,22 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
7373
org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
7474
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7575
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
76-
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
77-
org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
78-
org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
79-
org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
80-
org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
81-
org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
82-
org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
83-
org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
76+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
77+
org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
78+
org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
79+
org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
80+
org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
81+
org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
82+
org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
83+
org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
8484
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
85-
org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
85+
org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8686
org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8787
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
8888
org.hypertrace.core.grpcutils:grpc-server-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8989
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9090
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
9191
org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
92-
org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
92+
org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
9393
org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
9494
empty=

‎platform-http-service-framework/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ dependencies {
1515
implementation(commonLibs.slf4j2.api)
1616
implementation(commonLibs.guice.servlet)
1717
implementation(commonLibs.guava)
18-
implementation(commonLibs.jetty.servlet)
19-
implementation(commonLibs.jetty.server)
20-
implementation(commonLibs.jetty.servlets)
18+
implementation(localLibs.jetty.ee10.servlet)
19+
implementation(localLibs.jetty.server)
20+
implementation(localLibs.jetty.ee10.servlets)
2121
annotationProcessor(commonLibs.lombok)
2222
compileOnly(commonLibs.lombok)
2323
}

‎platform-http-service-framework/gradle.lockfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
6161
org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath
6262
org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath
6363
org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath
64-
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
66-
org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67-
org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
68-
org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
69-
org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
70-
org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
71-
org.eclipse.jetty:jetty-servlets:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
72-
org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
64+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65+
org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
66+
org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67+
org.eclipse.jetty:jetty-http:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
68+
org.eclipse.jetty:jetty-io:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
69+
org.eclipse.jetty:jetty-security:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
70+
org.eclipse.jetty:jetty-server:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
71+
org.eclipse.jetty:jetty-session:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
72+
org.eclipse.jetty:jetty-util:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7373
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
74-
org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
74+
org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7575
org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7676
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
7777
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7878
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
7979
org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
80-
org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
80+
org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8181
empty=

‎platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717
import java.util.concurrent.ExecutorService;
1818
import java.util.concurrent.Executors;
1919
import javax.annotation.Nullable;
20+
import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
21+
import org.eclipse.jetty.ee10.servlet.FilterHolder;
22+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
23+
import org.eclipse.jetty.ee10.servlet.ServletHolder;
24+
import org.eclipse.jetty.ee10.servlets.CrossOriginFilter;
2025
import org.eclipse.jetty.server.Connector;
2126
import org.eclipse.jetty.server.Handler;
2227
import org.eclipse.jetty.server.HttpConfiguration;
2328
import org.eclipse.jetty.server.HttpConnectionFactory;
2429
import org.eclipse.jetty.server.Server;
2530
import org.eclipse.jetty.server.ServerConnector;
2631
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
27-
import org.eclipse.jetty.server.handler.ErrorHandler;
28-
import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
29-
import org.eclipse.jetty.servlet.FilterHolder;
30-
import org.eclipse.jetty.servlet.ServletContextHandler;
31-
import org.eclipse.jetty.servlet.ServletHolder;
32-
import org.eclipse.jetty.servlets.CrossOriginFilter;
3332
import org.hypertrace.core.serviceframework.http.HttpContainer;
3433
import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition;
3534
import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition.CorsConfig;
@@ -105,7 +104,7 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) {
105104
? ServletContextHandler.SESSIONS
106105
: ServletContextHandler.NO_SESSIONS;
107106
ServletContextHandler context = new ServletContextHandler(options);
108-
ErrorHandler errorHandler = new ErrorPageErrorHandler();
107+
ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
109108
errorHandler.setShowServlet(false);
110109
errorHandler.setShowStacks(false);
111110
context.setErrorHandler(errorHandler);
@@ -128,7 +127,7 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) {
128127
this.buildServletHolderIfRequired(handlerDefinition)
129128
.ifPresent(
130129
servletHolder -> context.addServlet(servletHolder, handlerDefinition.getContextPath()));
131-
context.setVirtualHosts(new String[] {"@" + handlerDefinition.getName()});
130+
context.setVirtualHosts(List.of("@" + handlerDefinition.getName()));
132131
return context;
133132
}
134133

‎platform-hybrid-service-framework/gradle.lockfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,23 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
7979
org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
8080
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8181
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
82-
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
83-
org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
84-
org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
85-
org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
86-
org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
87-
org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
88-
org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
89-
org.eclipse.jetty:jetty-servlets:11.0.26=runtimeClasspath,testRuntimeClasspath
90-
org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
82+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
83+
org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.33=runtimeClasspath,testRuntimeClasspath
84+
org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
85+
org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
86+
org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
87+
org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
88+
org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
89+
org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
90+
org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
9191
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
92-
org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
92+
org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9393
org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9494
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
9595
org.hypertrace.core.grpcutils:grpc-server-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
9696
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9797
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
9898
org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
99-
org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
99+
org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
100100
org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
101101
empty=

‎platform-metrics/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
implementation(localLibs.prometheus.simpleclient.dropwizard)
2323
implementation(localLibs.prometheus.simpleclient.servlet.jakarta)
2424
implementation(localLibs.prometheus.simpleclient.pushgateway)
25-
implementation(commonLibs.jetty.servlet)
25+
implementation(localLibs.jetty.ee10.servlet)
2626
implementation(commonLibs.guava)
2727

2828
compileOnly(localLibs.caffeine)

0 commit comments

Comments
 (0)