Skip to content
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

Jump to bottom

[branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and vertx #4398

Merged
merged 4 commits into from
May 28, 2024
Merged

[branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and vertx #4398

merged 4 commits into from
May 28, 2024

Conversation

zhiheng123
Copy link
Contributor

Descriptions of the changes in this PR:

Fix #xyz

Main Issue: #xyz

BP: #xyz

Motivation

(Explain: why you're making that change, what is the problem you're trying to solve)

Changes

(Describe: what changes you have made)

In order to uphold a high standard for quality for code contributions, Apache BookKeeper runs various precommit
checks for pull requests. A pull request can only be merged when it passes precommit checks.

Be sure to do all the following to help us incorporate your contribution
quickly and easily:

If this PR is a BookKeeper Proposal (BP):

  • Make sure the PR title is formatted like:
    <BP-#>: Description of bookkeeper proposal
    e.g. BP-1: 64 bits ledger is support
  • Attach the master issue link in the description of this PR.
  • Attach the google doc link if the BP is written in Google Doc.

Otherwise:

  • Make sure the PR title is formatted like:
    <Issue #>: Description of pull request
    e.g. Issue 123: Description ...
  • Make sure tests pass via mvn clean apache-rat:check install spotbugs:check.
  • Replace <Issue #> in the title with the actual Issue number.

@zhiheng123 zhiheng123 marked this pull request as ready for review May 28, 2024 02:18
shoothzj
shoothzj approved these changes May 28, 2024
View reviewed changes
Copy link
Member

@shoothzj shoothzj left a comment

Choose a reason for hiding this comment

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

Thanks for your help :)

@zhiheng123 zhiheng123 force-pushed the git_cp_4265 branch 2 times, most recently from b61aec2 to 79c95a4 Compare May 28, 2024 06:25
@shoothzj
Copy link
Member

I think we can also add #4204 and #4224 into release/4.16.6, they both update on netty libraries.

BTW, Can we use one pr to include 3 cherry-pick PRs? Is this valid? @nicoloboschi @dlg99

@shoothzj shoothzj changed the title Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (#4265) [branch-4.16] Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (#4265) May 28, 2024
lhotari and others added 4 commits May 28, 2024 17:39
@lhotari @zhiheng123
Upgrade Netty to 4.1.104.Final and io_uring to 0.0.24.Final (apache#4157
2cc7dc0 
)

(cherry-pick from commit 6f5d756)
@lhotari @zhiheng123
Use netty-bom for aligning netty library versions, add epoll for linu…
51370bb 
…x-aarch_64 (apache#4204)

(cherry-pick from commit bb9da9b)
@sullis @zhiheng123
Upgrade Netty to 4.1.107.Final and io_uring to 0.0.25.Final (apache#4224
c45714d 
)

Co-authored-by: ZhangJian He <[email protected]>

(cherry-pick from commit 2980935)
Conflicts(mockito version):
    pom.xml
@lhotari @zhiheng123
Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (apache#4265)
39bb15d 
- Upgrade vertx-core to 4.5.7 to address CVE-2024-1300
- Depends on merging apache#4264 before this PR (since Netty 4.1.108.Final is required for vertx-core 4.5.7)

(cherry-pick from commit bee9b48)
Conflicts(zookeeper version):
    pom.xml
@zhiheng123 zhiheng123 changed the title [branch-4.16] Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (#4265) [branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and vertx May 28, 2024
@shoothzj shoothzj merged commit aff2fb6 into apache:branch-4.16 May 28, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shoothzj shoothzj shoothzj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zhiheng123 @shoothzj @lhotari @sullis