Skip to content

Commit 7b4f2f5

Browse files
authored
Merge branch 'kafbat:main' into issues/1324
2 parents 9f17149 + a3910a4 commit 7b4f2f5

File tree

6 files changed

+77
-5
lines changed

6 files changed

+77
-5
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,19 @@ updates:
2020
update-types:
2121
- "patch"
2222
- "minor"
23+
exclude-patterns:
24+
- "org.springframework.boot:*"
25+
- "io.spring.dependency-management"
26+
# All netty references are temporary overwrites that must be set carefully
27+
# We do not need dependabot to send pull requests
28+
- "io.netty:*"
2329
other-dependencies:
2430
exclude-patterns:
2531
- "org.springframework.boot:*"
2632
- "io.spring.dependency-management"
33+
# All netty references are temporary overwrites that must be set carefully
34+
# We do not need dependabot to send pull requests
35+
- "io.netty:*"
2736
patterns:
2837
- "*"
2938
update-types:
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "E2E: Playwright Manual run"
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
sha:
6+
description: Commit to run on
7+
required: true
8+
type: string
9+
10+
permissions:
11+
contents: read
12+
checks: write
13+
statuses: write
14+
15+
jobs:
16+
build-and-test:
17+
uses: ./.github/workflows/e2e-playwright-run.yml
18+
secrets: inherit
19+
with:
20+
sha: ${{ inputs.sha }}
21+
22+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "Playwright E2E: PR tests"
2+
on:
3+
pull_request:
4+
types: [ "opened", "reopened", "synchronize" ]
5+
paths:
6+
- "build.gradle"
7+
- "gradle.properties"
8+
- "settings.gradle"
9+
- "gradle/libs.versions.toml"
10+
11+
- "contract/**"
12+
- "api/**"
13+
- "serde-api/**"
14+
- "frontend/**"
15+
- "e2e-playwright/**"
16+
17+
permissions:
18+
contents: read
19+
checks: write
20+
statuses: write
21+
22+
jobs:
23+
build-and-test:
24+
uses: ./.github/workflows/e2e-playwright-run.yml
25+
secrets: inherit
26+
with:
27+
sha: ${{ github.event.pull_request.head.sha }}

.github/workflows/e2e-playwright.yml renamed to .github/workflows/e2e-playwright-run.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
name: "E2E: Playwright Manual run"
1+
name: "E2E: Playwright"
2+
23
on:
3-
workflow_dispatch:
4-
sha:
5-
required: true
6-
type: string
4+
workflow_call:
5+
inputs:
6+
sha:
7+
required: true
8+
type: string
79

810
permissions:
911
contents: read
@@ -30,6 +32,7 @@ jobs:
3032
uses: actions/setup-node@v3
3133
with:
3234
node-version: 18
35+
cache: 'npm'
3336

3437
- name: Install NPM dependencies
3538
working-directory: ./e2e-playwright

api/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ dependencies {
6868
// CVE Fixes
6969
implementation libs.apache.commons.compress
7070
implementation libs.okhttp3.logging.intercepter
71+
// START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
72+
implementation libs.netty.codec
73+
implementation libs.netty.codec.http
74+
// END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
7175
// CVE Fixes End
7276

7377
implementation libs.modelcontextprotocol.spring.webflux

gradle/libs.versions.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[versions]
22
spring-boot = '3.5.5'
33
nimbus-jose-jwt = '10.0.2'
4+
netty = '4.1.125.Final'
45

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

151152
snappy = {module = 'org.xerial.snappy:snappy-java', version = '1.1.10.7'}
153+
154+
# CVE fixes
155+
# START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
156+
netty-codec = {module = 'io.netty:netty-codec', version.ref = 'netty'}
157+
netty-codec-http = {module = 'io.netty:netty-codec-http', version.ref = 'netty'}
158+
# END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057

0 commit comments

Comments
 (0)