From 3b5be859a614fc143ff2212ae7e783c59b137cd2 Mon Sep 17 00:00:00 2001 From: Sidharth Jain <32795041+sidharth-jain23@users.noreply.github.com> Date: Thu, 14 May 2026 20:35:01 +0530 Subject: [PATCH 1/5] Update Jetty to 12.1.8 and jakarta-servlet-api to 6.1.0 - Migrate Jetty module coordinates to EE10 variants for Jetty 12 compatibility: - jetty-servlet -> org.eclipse.jetty.ee10:jetty-ee10-servlet - jetty-servlets -> org.eclipse.jetty.ee10:jetty-ee10-servlets - jetty-server remains org.eclipse.jetty:jetty-server (core module) - Bump jakarta-servlet-api from 6.0.0 to 6.1.0 (required by Jetty 12.1 EE10) Co-Authored-By: Claude Opus 4.6 --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c45e66..f212357 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ hypertrace-attributeservice = "0.14.35" hypertrace-gatewayservice = "0.3.9" hypertrace-entityservice = "0.8.86" hypertrace-configservice = "0.1.74" -jetty = "11.0.26" +jetty = "12.1.8" netty = "4.1.132.Final" junit = "5.10.0" @@ -41,11 +41,11 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" } jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" } jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" } jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" } -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" } jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" } -jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet" } +jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet" } jetty-server = { module = "org.eclipse.jetty:jetty-server" } -jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets" } +jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets" } netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" } protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" } protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" } From acf63e6cc45ea119e3f92bed84473e3884d5d23b Mon Sep 17 00:00:00 2001 From: Sidharth Jain <32795041+sidharth-jain23@users.noreply.github.com> Date: Thu, 14 May 2026 21:08:54 +0530 Subject: [PATCH 2/5] Add jetty-ee10-bom and fix EE10 module version resolution The EE10 servlet modules (org.eclipse.jetty.ee10:*) are not managed by the core jetty-bom (org.eclipse.jetty:jetty-bom). Add the jetty-ee10-bom as a platform import and explicit versions to ensure resolution works. Co-Authored-By: Claude Opus 4.6 --- gradle/libs.versions.toml | 5 +++-- hypertrace-bom/build.gradle.kts | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f212357..4825165 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,9 +43,10 @@ jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datat jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" } jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" } -jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet" } +jetty-ee10-bom = { module = "org.eclipse.jetty.ee10:jetty-ee10-bom", version.ref = "jetty" } +jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" } jetty-server = { module = "org.eclipse.jetty:jetty-server" } -jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets" } +jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" } netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" } protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" } protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" } diff --git a/hypertrace-bom/build.gradle.kts b/hypertrace-bom/build.gradle.kts index 7b976a5..9d018fe 100644 --- a/hypertrace-bom/build.gradle.kts +++ b/hypertrace-bom/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { api(platform(libs.jackson.bom)) api(platform(libs.hypertrace.kafka.bom)) api(platform(libs.jetty.bom)) + api(platform(libs.jetty.ee10.bom)) api(platform(libs.netty.bom)) constraints { api(libs.hypertrace.grpcutils.context) @@ -59,5 +60,7 @@ dependencies { api(libs.guice.servlet) api(libs.jakarta.inject.api) api(libs.jakarta.servlet.api) + api(libs.jetty.servlet) + api(libs.jetty.servlets) } } From 99494b9852be45ddf1ae8ab118c093369576fced Mon Sep 17 00:00:00 2001 From: Sidharth Jain <32795041+sidharth-jain23@users.noreply.github.com> Date: Thu, 14 May 2026 21:14:33 +0530 Subject: [PATCH 3/5] Update Jetty to 12.1.9 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4825165..dcc66ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ hypertrace-attributeservice = "0.14.35" hypertrace-gatewayservice = "0.3.9" hypertrace-entityservice = "0.8.86" hypertrace-configservice = "0.1.74" -jetty = "12.1.8" +jetty = "12.1.9" netty = "4.1.132.Final" junit = "5.10.0" From 2802d2632b53c9dc16c90254a82bb92050196b6f Mon Sep 17 00:00:00 2001 From: Sidharth Jain <32795041+sidharth-jain23@users.noreply.github.com> Date: Thu, 14 May 2026 21:15:42 +0530 Subject: [PATCH 4/5] address comments --- hypertrace-bom/build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/hypertrace-bom/build.gradle.kts b/hypertrace-bom/build.gradle.kts index 9d018fe..97b8374 100644 --- a/hypertrace-bom/build.gradle.kts +++ b/hypertrace-bom/build.gradle.kts @@ -60,7 +60,5 @@ dependencies { api(libs.guice.servlet) api(libs.jakarta.inject.api) api(libs.jakarta.servlet.api) - api(libs.jetty.servlet) - api(libs.jetty.servlets) } } From 138edc232d02b6b1669fc72e732b2f4f42f89e02 Mon Sep 17 00:00:00 2001 From: Sidharth Jain <32795041+sidharth-jain23@users.noreply.github.com> Date: Fri, 15 May 2026 01:07:41 +0530 Subject: [PATCH 5/5] Temporarily comment out service-framework deps in test-consumer These deps pull in the old Jetty 11 coordinates (org.eclipse.jetty:jetty-servlet) which no longer resolve under Jetty 12. Will uncomment after publishing a new service-framework version built with EE10 coordinates. Co-Authored-By: Claude Opus 4.6 --- test-consumer/build.gradle.kts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/test-consumer/build.gradle.kts b/test-consumer/build.gradle.kts index 5f37e93..6562069 100644 --- a/test-consumer/build.gradle.kts +++ b/test-consumer/build.gradle.kts @@ -9,12 +9,13 @@ dependencies { api(libs.hypertrace.grpcutils.server) api(libs.hypertrace.grpcutils.rx.client) api(libs.hypertrace.grpcutils.rx.server) - api(libs.hypertrace.framework.grpc) - api(libs.hypertrace.framework.http) - api(libs.hypertrace.framework.spi) - api(libs.hypertrace.kafka.framework) - api(libs.hypertrace.integrationtest.framework) - api(libs.hypertrace.framework.documentstore.metrics) + // TODO: uncomment after publishing service-framework with Jetty 12 + // api(libs.hypertrace.framework.grpc) + // api(libs.hypertrace.framework.http) + // api(libs.hypertrace.framework.spi) + // api(libs.hypertrace.kafka.framework) + // api(libs.hypertrace.integrationtest.framework) + // api(libs.hypertrace.framework.documentstore.metrics) api(libs.hypertrace.documentstore) api(libs.hypertrace.eventstore) api(libs.hypertrace.attributeservice.api) @@ -57,11 +58,12 @@ dependencies { api(libs.commons.text) api(libs.graphql.java) api(libs.jsr305) - api(libs.hypertrace.framework.grpc.jakarta) - api(libs.hypertrace.framework.http.jakarta) - api(libs.hypertrace.framework.spi.jakarta) - api(libs.hypertrace.integrationtest.framework.jakarta) - api(libs.hypertrace.framework.documentstore.metrics.jakarta) + // TODO: uncomment after publishing service-framework with Jetty 12 + // api(libs.hypertrace.framework.grpc.jakarta) + // api(libs.hypertrace.framework.http.jakarta) + // api(libs.hypertrace.framework.spi.jakarta) + // api(libs.hypertrace.integrationtest.framework.jakarta) + // api(libs.hypertrace.framework.documentstore.metrics.jakarta) api(libs.apache.httpcomponents.httpclient) api(libs.awaitility) api(libs.jakarta.inject.api)