Skip to content

chore: Update Jetty to 12.1.9 and jakarta-servlet-api to 6.1.0 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sidharth-jain23 wants to merge 5 commits into
base: main
Choose a base branch
from
+19 −15
Open

chore: Update Jetty to 12.1.9 and jakarta-servlet-api to 6.1.0 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b5be85
Update Jetty to 12.1.8 and jakarta-servlet-api to 6.1.0
sidharth-jain23 May 14, 2026
acf63e6
Add jetty-ee10-bom and fix EE10 module version resolution
sidharth-jain23 May 14, 2026
99494b9
Update Jetty to 12.1.9
sidharth-jain23 May 14, 2026
2802d26
address comments
sidharth-jain23 May 14, 2026
138edc2
Temporarily comment out service-framework deps in test-consumer
sidharth-jain23 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9"
netty = "4.1.132.Final"

junit = "5.10.0"
Expand Down Expand Up @@ -41,11 +41,12 @@ 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-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:jetty-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" }
Expand Down
1 change: 1 addition & 0 deletions hypertrace-bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 13 additions & 11 deletions test-consumer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor

@avinashkolluru avinashkolluru May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't understand this

Copy link
Copy Markdown
Author

@sidharth-jain23 sidharth-jain23 May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test-consumer in this repo verifies dep resolution for hypertrace framework artifacts which right now pull in the old Jetty 11 coordinates (org.eclipse.jetty:jetty-servlet) which no longer resolve under Jetty 12 & hence build will fail..
once we upgrade jetty in hypertrace framework & publish the new version in this bom repo, we can uncomment these deps

Copy link
Copy Markdown
Author

@sidharth-jain23 sidharth-jain23 May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought of this as the best way to workaround this.. open to better suggestions

// 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)
Expand Down Expand Up @@ -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)
Expand Down
Loading