Skip to content

Commit 87d1f9e

Browse files
refactor: update grpc, netty, jetty (#112)
1 parent 23c3062 commit 87d1f9e

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
args: copyAllReports --output-dir=/tmp/test-reports
3838

3939
- name: Archive test reports
40-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
4141
with:
4242
name: test-reports
4343
path: /tmp/test-reports

owasp-suppressions.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +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[
5-
file name: jetty-http-11.0.20.jar
6-
]]></notes>
7-
<packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty\-.*@.*$</packageUrl>
8-
<cve>CVE-2024-8184</cve>
9-
<cve>CVE-2024-6763</cve>
10-
</suppress>
113
</suppressions>

platform-grpc-service-framework/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ plugins {
77

88
dependencies {
99
api(project(":platform-service-framework"))
10-
api(platform("io.grpc:grpc-bom:1.68.1"))
10+
api(platform("io.grpc:grpc-bom:1.68.3"))
1111
api("io.grpc:grpc-api")
1212
api("io.grpc:grpc-services")
13-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7")
13+
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10")
1414
api("com.typesafe:config:1.4.2")
1515
api("com.google.protobuf:protobuf-java:3.25.5")
1616
api(project(":service-framework-spi"))
@@ -22,5 +22,5 @@ dependencies {
2222
implementation("io.grpc:grpc-inprocess")
2323
implementation("io.grpc:grpc-netty")
2424
implementation("org.slf4j:slf4j-api:1.7.36")
25-
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.7")
25+
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.10")
2626
}

platform-http-service-framework/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
dependencies {
77
api(project(":platform-service-framework"))
8-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7")
8+
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10")
99
api("com.typesafe:config:1.4.2")
1010
api("jakarta.servlet:jakarta.servlet-api:6.0.0")
1111
api("com.google.inject:guice:7.0.0")
@@ -15,9 +15,9 @@ dependencies {
1515
implementation("org.slf4j:slf4j-api:1.7.36")
1616
implementation("com.google.inject.extensions:guice-servlet:7.0.0")
1717
implementation("com.google.guava:guava:31.1-jre")
18-
implementation("org.eclipse.jetty:jetty-servlet:11.0.20")
19-
implementation("org.eclipse.jetty:jetty-server:11.0.20")
20-
implementation("org.eclipse.jetty:jetty-servlets:11.0.20")
18+
implementation("org.eclipse.jetty:jetty-servlet:11.0.24")
19+
implementation("org.eclipse.jetty:jetty-server:11.0.24")
20+
implementation("org.eclipse.jetty:jetty-servlets:11.0.24")
2121
annotationProcessor("org.projectlombok:lombok:1.18.24")
2222
compileOnly("org.projectlombok:lombok:1.18.24")
2323
}

platform-metrics/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation("io.prometheus:simpleclient_dropwizard:0.16.0")
2424
implementation("io.prometheus:simpleclient_servlet_jakarta:0.16.0")
2525
implementation("io.prometheus:simpleclient_pushgateway:0.16.0")
26-
implementation("org.eclipse.jetty:jetty-servlet:11.0.20")
26+
implementation("org.eclipse.jetty:jetty-servlet:11.0.24")
2727
implementation("com.google.guava:guava:32.0.1-jre")
2828

2929
compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.8")

platform-service-framework/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919

2020
// Use for thread dump servlet
2121
implementation("io.dropwizard.metrics:metrics-jakarta-servlets:4.2.25")
22-
implementation("org.eclipse.jetty:jetty-servlet:11.0.20")
22+
implementation("org.eclipse.jetty:jetty-servlet:11.0.24")
2323

2424
// Use for metrics servlet
2525
implementation("io.prometheus:simpleclient_servlet_jakarta:0.16.0")

0 commit comments

Comments
 (0)