Skip to content

Commit acf63e6

Browse files
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 <noreply@anthropic.com>
1 parent 3b5be85 commit acf63e6

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

gradle/libs.versions.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datat
4343
jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" }
4444
jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
4545
jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
46-
jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet" }
46+
jetty-ee10-bom = { module = "org.eclipse.jetty.ee10:jetty-ee10-bom", version.ref = "jetty" }
47+
jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
4748
jetty-server = { module = "org.eclipse.jetty:jetty-server" }
48-
jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets" }
49+
jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" }
4950
netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
5051
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" }
5152
protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" }

hypertrace-bom/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies {
1212
api(platform(libs.jackson.bom))
1313
api(platform(libs.hypertrace.kafka.bom))
1414
api(platform(libs.jetty.bom))
15+
api(platform(libs.jetty.ee10.bom))
1516
api(platform(libs.netty.bom))
1617
constraints {
1718
api(libs.hypertrace.grpcutils.context)
@@ -59,5 +60,7 @@ dependencies {
5960
api(libs.guice.servlet)
6061
api(libs.jakarta.inject.api)
6162
api(libs.jakarta.servlet.api)
63+
api(libs.jetty.servlet)
64+
api(libs.jetty.servlets)
6265
}
6366
}

0 commit comments

Comments
 (0)