-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Upgrade netty to 4.1.84.Final #4893
Conversation
Thanks @cwperks ! |
Gradle Check (Jenkins) Run Completed with:
|
@peterzhuamazon seems like Jenkins is broken? |
@reta The contribution I made to netty that introduced a build failure for security that required reverting has been patched. This was the initial contribution to read keys using bouncycastle if it was present on the classpath: netty/netty#12670 Fixes in key loading were fixed in 4.1.81.Final - see the first 2 lines here: https://netty.io/news/2022/09/08/4-1-81-Final.html Another bug associated with the change for reading certificate files with multiple certs inside was included in this past release: https://netty.io/news/2022/10/11/4-1-84-Final.html (last line of release notes) |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #4893 +/- ##
============================================
- Coverage 70.74% 70.72% -0.02%
+ Complexity 57859 57841 -18
============================================
Files 4689 4689
Lines 276913 276913
Branches 40301 40301
============================================
- Hits 195912 195858 -54
- Misses 64780 64848 +68
+ Partials 16221 16207 -14
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
5e68bbc
to
a6cfa26
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-4893-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-4893-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-4893-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-4893-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.1 2.1
# Navigate to the new working tree
cd .worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-4893-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-2.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.1 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.2 2.2
# Navigate to the new working tree
cd .worktrees/backport-2.2
# Create a new branch
git switch --create backport/backport-4893-to-2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-2.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.2 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-4893-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8fda187bb459757164cc80c91ca305d274ca2b53
# Push it to GitHub
git push --set-upstream origin backport/backport-4893-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3 Then, create a pull request where the |
We were on another deployment tho. Sorry. |
I will take care of the manual backports |
Hi @cwperks seems like this part of the documentation also need some updates as well: See part with pkcs8 let me know if it is accurate. Thanks. |
@peterzhuamazon It is accurate at the moment, but will change if |
* Upgrade netty to 4.1.84.Final Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add line in CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 8fda187)
Done creating manual backports |
* Upgrade netty to 4.1.84.Final Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add line in CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins cwperx@amazon.com
Description
Upgrades netty from 4.1.79.Final -> 4.1.84.Final
Netty has released bugfixes for the issues preventing core from upgrading to 4.1.80.Final. See previous revert commit for details: #4428
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.