Skip to content

Commit 2046c2b

Browse files
Bump service-framework to 0.1.94 and remove temporary workarounds
- Upgrade hypertrace-framework from 0.1.93 to 0.1.94 (now uses Jetty 12 EE10 coordinates) - Restore service-framework deps in test-consumer (no longer pulls old org.eclipse.jetty:jetty-servlet coordinates) - Remove CVE-2026-41417 OWASP suppression (service-framework 0.1.94 was built against BOM with netty 4.1.133.Final) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 9353902 commit 2046c2b

3 files changed

Lines changed: 12 additions & 18 deletions

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
protoc = "3.25.8"
33
grpc = "1.75.0"
4-
hypertrace-framework = "0.1.93"
4+
hypertrace-framework = "0.1.94"
55
hypertrace-grpcutils = "0.13.23"
66
hypertrace-kafka = "0.6.4"
77
hypertrace-bom = "+"

owasp-suppressions.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
<suppress>
4-
<notes><![CDATA[Temporary suppression until service-framework is published with Netty 4.1.133.Final]]></notes>
5-
<cve>CVE-2026-41417</cve>
6-
</suppress>
73
</suppressions>

test-consumer/build.gradle.kts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ dependencies {
99
api(libs.hypertrace.grpcutils.server)
1010
api(libs.hypertrace.grpcutils.rx.client)
1111
api(libs.hypertrace.grpcutils.rx.server)
12-
// TODO: uncomment after publishing service-framework with Jetty 12
13-
// api(libs.hypertrace.framework.grpc)
14-
// api(libs.hypertrace.framework.http)
15-
// api(libs.hypertrace.framework.spi)
16-
// api(libs.hypertrace.kafka.framework)
17-
// api(libs.hypertrace.integrationtest.framework)
18-
// api(libs.hypertrace.framework.documentstore.metrics)
12+
api(libs.hypertrace.framework.grpc)
13+
api(libs.hypertrace.framework.http)
14+
api(libs.hypertrace.framework.spi)
15+
api(libs.hypertrace.kafka.framework)
16+
api(libs.hypertrace.integrationtest.framework)
17+
api(libs.hypertrace.framework.documentstore.metrics)
1918
api(libs.hypertrace.documentstore)
2019
api(libs.hypertrace.eventstore)
2120
api(libs.hypertrace.attributeservice.api)
@@ -58,12 +57,11 @@ dependencies {
5857
api(libs.commons.text)
5958
api(libs.graphql.java)
6059
api(libs.jsr305)
61-
// TODO: uncomment after publishing service-framework with Jetty 12
62-
// api(libs.hypertrace.framework.grpc.jakarta)
63-
// api(libs.hypertrace.framework.http.jakarta)
64-
// api(libs.hypertrace.framework.spi.jakarta)
65-
// api(libs.hypertrace.integrationtest.framework.jakarta)
66-
// api(libs.hypertrace.framework.documentstore.metrics.jakarta)
60+
api(libs.hypertrace.framework.grpc.jakarta)
61+
api(libs.hypertrace.framework.http.jakarta)
62+
api(libs.hypertrace.framework.spi.jakarta)
63+
api(libs.hypertrace.integrationtest.framework.jakarta)
64+
api(libs.hypertrace.framework.documentstore.metrics.jakarta)
6765
api(libs.apache.httpcomponents.httpclient)
6866
api(libs.awaitility)
6967
api(libs.jakarta.inject.api)

0 commit comments

Comments
 (0)