Skip to content

Commit

Permalink
Upgrade netty to 4.1.75
Browse files Browse the repository at this point in the history
  • Loading branch information
vpanta committed Mar 31, 2022
1 parent 571de46 commit 11e06b3
Show file tree
Hide file tree
Showing 46 changed files with 39 additions and 33 deletions.
63 changes: 34 additions & 29 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -587,12 +587,12 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({
genrule(
name = "filter_netty_dynamic_libs",
srcs = select({
"//src/conditions:darwin_arm64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.44.Final-osx-x86_64.jar"],
"//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"],
"//src/conditions:darwin_arm64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar"],
"//src/conditions:linux_aarch64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar"],
"//src/conditions:linux_x86_64": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar"],
"//src/conditions:windows": ["netty_tcnative/netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar"],
"//conditions:default": [],
}),
outs = ["netty_tcnative/netty-tcnative-filtered.jar"],
cmd = "cp $< $@ && " +
Expand All @@ -605,38 +605,43 @@ distrib_java_import(
name = "netty",
enable_distributions = ["debian"],
jars = [
"netty/netty-buffer-4.1.69.Final.jar",
"netty/netty-codec-4.1.69.Final.jar",
"netty/netty-codec-http2-4.1.69.Final.jar",
"netty/netty-codec-http-4.1.69.Final.jar",
"netty/netty-common-4.1.69.Final.jar",
"netty/netty-handler-4.1.69.Final.jar",
"netty/netty-handler-proxy-4.1.69.Final.jar",
"netty/netty-resolver-4.1.69.Final.jar",
"netty/netty-resolver-dns-4.1.69.Final.jar",
"netty/netty-transport-4.1.69.Final.jar",
"netty/netty-transport-sctp-4.1.69.Final.jar",
"netty/netty-buffer-4.1.75.Final.jar",
"netty/netty-codec-4.1.75.Final.jar",
"netty/netty-codec-http2-4.1.75.Final.jar",
"netty/netty-codec-http-4.1.75.Final.jar",
"netty/netty-common-4.1.75.Final.jar",
"netty/netty-handler-4.1.75.Final.jar",
"netty/netty-handler-proxy-4.1.75.Final.jar",
"netty/netty-resolver-4.1.75.Final.jar",
"netty/netty-resolver-dns-4.1.75.Final.jar",
"netty/netty-transport-4.1.75.Final.jar",
"netty/netty-transport-classes-epoll-4.1.75.Final.jar",
"netty/netty-transport-classes-kqueue-4.1.75.Final.jar",
"netty/netty-transport-sctp-4.1.75.Final.jar",
] + select({
"//src/conditions:darwin_arm64": ["netty/netty-transport-native-unix-common-4.1.69.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty/netty-transport-native-unix-common-4.1.69.Final-osx-x86_64.jar"],
"//src/conditions:linux_aarch64": ["netty/netty-transport-native-unix-common-4.1.69.Final-linux-aarch_64.jar"],
"//src/conditions:linux_x86_64": ["netty/netty-transport-native-unix-common-4.1.69.Final-linux-x86_64.jar"],
"//conditions:default": ["netty/netty-transport-native-unix-common-4.1.69.Final.jar"],
"//src/conditions:darwin_arm64": ["netty/netty-transport-native-unix-common-4.1.75.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty/netty-transport-native-unix-common-4.1.75.Final-osx-x86_64.jar"],
"//src/conditions:linux_aarch64": ["netty/netty-transport-native-unix-common-4.1.75.Final-linux-aarch_64.jar"],
"//src/conditions:linux_x86_64": ["netty/netty-transport-native-unix-common-4.1.75.Final-linux-x86_64.jar"],
"//conditions:default": ["netty/netty-transport-native-unix-common-4.1.75.Final.jar"],
}) + select({
"//src/conditions:darwin_arm64": ["netty/netty-transport-native-kqueue-4.1.69.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty/netty-transport-native-kqueue-4.1.69.Final-osx-x86_64.jar"],
"//conditions:default": ["netty/netty-transport-native-kqueue-4.1.69.Final.jar"],
"//src/conditions:darwin_arm64": ["netty/netty-transport-native-kqueue-4.1.75.Final-osx-aarch_64.jar"],
"//src/conditions:darwin_x86_64": ["netty/netty-transport-native-kqueue-4.1.75.Final-osx-x86_64.jar"],
"//conditions:default": [],
}) + select({
"//src/conditions:linux_aarch64": ["netty/netty-transport-native-epoll-4.1.69.Final-linux-aarch_64.jar"],
"//src/conditions:linux_x86_64": ["netty/netty-transport-native-epoll-4.1.69.Final-linux-x86_64.jar"],
"//conditions:default": ["netty/netty-transport-native-epoll-4.1.69.Final.jar"],
"//src/conditions:linux_aarch64": ["netty/netty-transport-native-epoll-4.1.75.Final-linux-aarch_64.jar"],
"//src/conditions:linux_x86_64": ["netty/netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar"],
"//conditions:default": [],
}),
)

distrib_java_import(
name = "netty_tcnative",
enable_distributions = ["debian"],
jars = [":netty_tcnative/netty-tcnative-filtered.jar"],
jars = [
"netty_tcnative/netty-tcnative-classes-2.0.51.Final.jar",
":netty_tcnative/netty-tcnative-filtered.jar",
],
)

distrib_java_import(
Expand Down
4 changes: 2 additions & 2 deletions third_party/netty/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -193,7 +193,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
5 changes: 3 additions & 2 deletions third_party/netty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ Netty is an asynchronous event-driven network application framework for rapid de
* [Downloads](https://netty.io/downloads.html)
* [Documentation](https://netty.io/wiki/)
* [@netty_project](https://twitter.com/netty_project)
* [Official Discord server](https://discord.gg/q4aQ2XjaCa)

## How to build

For the detailed information about building and developing Netty, please visit [the developer guide](https://netty.io/wiki/developer-guide.html). This page only gives very basic information.

You require the following to build Netty:

* Latest stable [OpenJDK 8](https://adoptopenjdk.net)
* Latest stable [OpenJDK 8](https://adoptium.net/)
* Latest stable [Apache Maven](https://maven.apache.org/)
* If you are on Linux, you need [additional development packages](https://netty.io/wiki/native-transports.html) installed on your system, because you'll build the native transport.
* If you are on Linux or MacOS, you need [additional development packages](https://netty.io/wiki/native-transports.html) installed on your system, because you'll build the native transport.

Note that this is build-time requirement. JDK 5 (for 3.x) or 6 (for 4.0+ / 4.1+) is enough to run your Netty-based application.

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 11e06b3

Please sign in to comment.