From b726f5b87d3961da05c8648d935d7e693b0d0206 Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 10:29:48 +0530 Subject: [PATCH 1/7] upgrade jetty version to latest to pull in vuln fix --- 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 04c60a8..cb77cea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] hypertrace-grpcutils = "0.13.14" -jetty = "11.0.24" +jetty = "12.1.6" guice = "7.0.0" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" From 3c4ef380ce445729d41af921c3875abcd063c648 Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 11:13:41 +0530 Subject: [PATCH 2/7] revert to previous major version --- 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 cb77cea..e07cacd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] hypertrace-grpcutils = "0.13.14" -jetty = "12.1.6" +jetty = "11.0.25" guice = "7.0.0" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" From 9bce33546186a4bbc45a74b15170753f6ac64569 Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 11:14:24 +0530 Subject: [PATCH 3/7] revert to previous major version --- 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 e07cacd..3d13ed7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] hypertrace-grpcutils = "0.13.14" -jetty = "11.0.25" +jetty = "11.0.26" guice = "7.0.0" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" From 208b98ad87a86f7e13467cea68ee4d83901a8c78 Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 11:43:46 +0530 Subject: [PATCH 4/7] update hypertrace bom version --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index ff59eb9..436afea 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ plugins { } configure { - catalogVersion.set("0.3.51") + catalogVersion.set("0.3.72") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 35af03fdba8a94a8390517ac6a4483850495f2be Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 13:21:46 +0530 Subject: [PATCH 5/7] remove jetty --- gradle/libs.versions.toml | 4 ---- platform-http-service-framework/build.gradle.kts | 6 +++--- platform-metrics/build.gradle.kts | 2 +- platform-service-framework/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d13ed7..7bf7aee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] hypertrace-grpcutils = "0.13.14" -jetty = "11.0.26" guice = "7.0.0" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" @@ -21,9 +20,6 @@ micrometer-jvm-extras = { module = "io.github.mweirauch:micrometer-jvm-extras", prometheus-simpleclient-dropwizard = { module = "io.prometheus:simpleclient_dropwizard", version.ref = "prometheus-simpleclient" } prometheus-simpleclient-servlet-jakarta = { module = "io.prometheus:simpleclient_servlet_jakarta", version.ref = "prometheus-simpleclient" } prometheus-simpleclient-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus-simpleclient" } -jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" } -jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } -jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "jetty" } caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" } guice-servlet = { module = "com.google.inject.extensions:guice-servlet", version.ref = "guice" } apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" } diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts index 6ee5e7b..8e1e0b3 100644 --- a/platform-http-service-framework/build.gradle.kts +++ b/platform-http-service-framework/build.gradle.kts @@ -15,9 +15,9 @@ dependencies { implementation(commonLibs.slf4j2.api) implementation(localLibs.guice.servlet) implementation(commonLibs.guava) - implementation(localLibs.jetty.servlet) - implementation(localLibs.jetty.server) - implementation(localLibs.jetty.servlets) + implementation(commonLibs.jetty.servlet) + implementation(commonLibs.jetty.server) + implementation(commonLibs.jetty.servlets) annotationProcessor(commonLibs.lombok) compileOnly(commonLibs.lombok) } diff --git a/platform-metrics/build.gradle.kts b/platform-metrics/build.gradle.kts index af90582..1c61f2b 100644 --- a/platform-metrics/build.gradle.kts +++ b/platform-metrics/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { implementation(localLibs.prometheus.simpleclient.dropwizard) implementation(localLibs.prometheus.simpleclient.servlet.jakarta) implementation(localLibs.prometheus.simpleclient.pushgateway) - implementation(localLibs.jetty.servlet) + implementation(commonLibs.jetty.servlet) implementation(commonLibs.guava) compileOnly(localLibs.caffeine) diff --git a/platform-service-framework/build.gradle.kts b/platform-service-framework/build.gradle.kts index 0975830..400ae11 100644 --- a/platform-service-framework/build.gradle.kts +++ b/platform-service-framework/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { // Use for thread dump servlet implementation(localLibs.dropwizard.metrics.jakarta.servlets) - implementation(localLibs.jetty.servlet) + implementation(commonLibs.jetty.servlet) // Use for metrics servlet implementation(localLibs.prometheus.simpleclient.servlet.jakarta) From e460ed23b356d007f821ccd331253e0f0720a51b Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 13:25:10 +0530 Subject: [PATCH 6/7] update guice --- gradle/libs.versions.toml | 2 -- platform-http-service-framework/build.gradle.kts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7bf7aee..64871ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] hypertrace-grpcutils = "0.13.14" -guice = "7.0.0" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" prometheus-simpleclient = "0.16.0" @@ -21,7 +20,6 @@ prometheus-simpleclient-dropwizard = { module = "io.prometheus:simpleclient_drop prometheus-simpleclient-servlet-jakarta = { module = "io.prometheus:simpleclient_servlet_jakarta", version.ref = "prometheus-simpleclient" } prometheus-simpleclient-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus-simpleclient" } caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" } -guice-servlet = { module = "com.google.inject.extensions:guice-servlet", version.ref = "guice" } apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" } [plugins] diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts index 8e1e0b3..e0a695d 100644 --- a/platform-http-service-framework/build.gradle.kts +++ b/platform-http-service-framework/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(projects.platformMetrics) implementation(commonLibs.slf4j2.api) - implementation(localLibs.guice.servlet) + implementation(commonLibs.guice.servlet) implementation(commonLibs.guava) implementation(commonLibs.jetty.servlet) implementation(commonLibs.jetty.server) From 8c5be9debc2001339c4cd9bb7d6ac55875683b70 Mon Sep 17 00:00:00 2001 From: Varkeychan Jacob Date: Thu, 26 Feb 2026 13:36:18 +0530 Subject: [PATCH 7/7] use everything existing from bom --- gradle/libs.versions.toml | 3 --- platform-grpc-service-framework/build.gradle.kts | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64871ed..0409e1d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,4 @@ [versions] -hypertrace-grpcutils = "0.13.14" dropwizard-metrics = "4.2.25" micrometer = "1.14.4" prometheus-simpleclient = "0.16.0" @@ -7,8 +6,6 @@ caffeine = "3.1.8" [libraries] awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" } -hypertrace-grpcutils-server = { module = "org.hypertrace.core.grpcutils:grpc-server-utils", version.ref = "hypertrace-grpcutils" } -grpc-services = { module = "io.grpc:grpc-services" } jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.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" } diff --git a/platform-grpc-service-framework/build.gradle.kts b/platform-grpc-service-framework/build.gradle.kts index 8bb6d33..95317be 100644 --- a/platform-grpc-service-framework/build.gradle.kts +++ b/platform-grpc-service-framework/build.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { api(projects.platformServiceFramework) api(commonLibs.grpc.api) - api(localLibs.grpc.services) + api(commonLibs.grpc.services) api(commonLibs.hypertrace.grpcutils.client) api(commonLibs.typesafe.config) api(commonLibs.protobuf.java) @@ -21,5 +21,5 @@ dependencies { implementation(commonLibs.grpc.inprocess) implementation(commonLibs.grpc.netty) implementation(commonLibs.slf4j2.api) - implementation(localLibs.hypertrace.grpcutils.server) + implementation(commonLibs.hypertrace.grpcutils.server) }