-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.75 #15145
Upgrade netty to 4.1.75 #15145
Conversation
Not as simple as I'd hoped, will look deeper tomorrow. |
8199c3e
to
11e06b3
Compare
This isn't ready for review unfortunately, I'm still trying to get
which is resolvable by removing some of the patched-out contents, but the next blocker is:
which is its own bag of "I don't know how to untangle this"... |
1fa0f44
to
00d6d60
Compare
Ok, this is now ready for review. It's three distinct commits, each of which is probably viewed/reviewed on their own. I've updated the PR request above to go more into details about each commit and their purpose. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Can you rebase on master
?
And unfortunately, we cannot import a PR that contains both |
I understand that moving |
No worries, sounds good, I wasn't sure the right organization of the PRs, but I can rebase/re-structure it for sure. I'll revert this to a Draft for now, and re-open the PRs when they're ready. |
Well, that took a lot less than I'd feared. The only part which is not in |
Moves grpc-java jars to separate dir but keep BUILD structure for non-third-party references
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@meteorcloudy Can you help import this?
"//src/conditions:linux_aarch64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final-linux-aarch_64.jar"], | ||
"//src/conditions:linux_x86_64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final-linux-x86_64.jar"], | ||
"//src/conditions:windows": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final-windows-x86_64.jar"], | ||
"//conditions:default": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final.jar"], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This leaves the default case broken. Should this just be netty-tcnative-classes-2.0.51.Final.jar
, or is something more elaborate required?
In order to fix netty/netty#11815 for users of
bazel
, this upgrades the libraries underthird_party/netty
tonetty/[email protected]
, along withthird_party/netty_tcnative
tonetty/[email protected]
.This change needs to also include a
grpc-java
update to1.45.1
, to fix grpc/grpc-java#8981 which had been preventingnetty/[email protected]
from working properly.This PR has 3 parts/commits, which if necessary can be split and merged separately:
third_party/grpc-java
fromthird_party/grpc
third_party
directory.grpc/[email protected]
grpc/[email protected]
as well, however I ran into issues in the build that were beyond my understanding to fix. However, the attempt of updatinggrpc-java
alone was successful.netty/[email protected]
andnetty/[email protected]