Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,19 @@ updates:
update-types:
- "patch"
- "minor"
exclude-patterns:
- "org.springframework.boot:*"
- "io.spring.dependency-management"
# All netty references are temporary overwrites that must be set carefully
# We do not need dependabot to send pull requests
Copy link
Member

Choose a reason for hiding this comment

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

why not? once some lib bumps it to say our 4.1.125, should be good to merge, nah?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Because at least for now, we are only overwriting it for Spring transitively. Upgrading to a non-compatible version will just cause problems.

Even if 4.1.125.Final and 4.2.6.Final should be non breaking versions, experience says that Netty is very particular about conflicts and it just causes headaches.

As a side note, this dependabot configuration was not fully correct and it still created the PR #1326 but I'd suggest closing it instead of merging it.

I'll send a follow up to fix this

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Haarolean Please see #1329

- "io.netty:*"
other-dependencies:
exclude-patterns:
- "org.springframework.boot:*"
- "io.spring.dependency-management"
# All netty references are temporary overwrites that must be set carefully
# We do not need dependabot to send pull requests
- "io.netty:*"
patterns:
- "*"
update-types:
Expand Down
4 changes: 4 additions & 0 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ dependencies {
// CVE Fixes
implementation libs.apache.commons.compress
implementation libs.okhttp3.logging.intercepter
// START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
implementation libs.netty.codec
implementation libs.netty.codec.http
// END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
// CVE Fixes End

implementation libs.modelcontextprotocol.spring.webflux
Expand Down
7 changes: 7 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[versions]
spring-boot = '3.5.5'
nimbus-jose-jwt = '10.0.2'
netty = '4.1.125.Final'

aws-msk-auth = '2.3.0'
azure-identity = '1.15.4'
Expand Down Expand Up @@ -149,3 +150,9 @@ prometheus-metrics-textformats = { module = 'io.prometheus:prometheus-metrics-ex
prometheus-metrics-exporter-pushgateway = { module = 'io.prometheus:prometheus-metrics-exporter-pushgateway', version.ref = 'prometheus'}

snappy = {module = 'org.xerial.snappy:snappy-java', version = '1.1.10.7'}

# CVE fixes
# START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
netty-codec = {module = 'io.netty:netty-codec', version.ref = 'netty'}
netty-codec-http = {module = 'io.netty:netty-codec-http', version.ref = 'netty'}
# END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
Loading