Skip to content

Merge Conflict Resolution (from 7.9.x to 8.0.x) #11004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pragatiguptaaa merged 9 commits into from
Apr 13, 2026
Merged

Merge Conflict Resolution (from 7.9.x to 8.0.x) #11004

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8475ca
fix(cve): [KSQL-14692] CVE-2026-33870 — bump netty to 4.1.132.Final
pragatiguptaaa Apr 10, 2026
8093038
Merge pull request #11003 from confluentinc/KSQL-14692-7.4.x
pragatiguptaaa Apr 10, 2026
1ea778c
Merge branch '7.4.x' into 7.5.x by pragatiguptaaa
semaphore-agent-production[bot] Apr 11, 2026
6bd17a2
Merge branch '7.5.x' into 7.6.x by pragatiguptaaa
semaphore-agent-production[bot] Apr 11, 2026
fea63de
Merge branch '7.6.x' into 7.7.x by pragatiguptaaa
semaphore-agent-production[bot] Apr 11, 2026
d93a689
Merge branch '7.7.x' into 7.8.x by pragatiguptaaa
semaphore-agent-production[bot] Apr 11, 2026
826034e
Merge branch '7.8.x' into 7.9.x by pragatiguptaaa
semaphore-agent-production[bot] Apr 11, 2026
5e981f4
Merge remote-tracking branch 'refs/remotes/origin/8.0.x' into pr_merg…
pragatiguptaaa Apr 11, 2026
d30b8cc
Resolve merge conflicts.
pragatiguptaaa Apr 11, 2026
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@
<apache.io.version>2.11.0</apache.io.version>
<io.confluent.ksql.version>8.0.5-0</io.confluent.ksql.version>
<io.confluent.schema-registry.version>${confluent.version.range}</io.confluent.schema-registry.version>
<netty-tcnative-version>2.0.74.Final</netty-tcnative-version>
<netty-tcnative-version>2.0.75.Final</netty-tcnative-version>
<!-- We normally get this from common, but Vertx is built against this -->
<!-- Note: `netty` depends on `tcnative` and if we bump `netty`
we might need to bump `tcnative`, too.
Please check top level `pom.xml` at https://github.com/netty/netty
for the netty version we bump to (ie, corresponding git tag),
to find the correct `tcnative` version. -->
<netty.version>4.1.130.Final</netty.version>
<netty-codec-http2-version>4.1.130.Final</netty-codec-http2-version>
<netty.version>4.1.132.Final</netty.version>
<netty-codec-http2-version>4.1.132.Final</netty-codec-http2-version>
<jersey-common>3.1.10</jersey-common>
<multi-threaded-testing.forkCount>3</multi-threaded-testing.forkCount>
<kafka.version>${ce.kafka.version}</kafka.version>
Expand Down