This is an automated email from the ASF dual-hosted git repository. guangning pushed a commit to branch branch-2.5 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4b957014233acbc27cd70cc438d1215596bed704 Author: Matteo Merli <[email protected]> AuthorDate: Fri Feb 7 20:17:18 2020 -0800 Pin the netty-transport-native-epoll to avoid conflicts (#6194) ### Motivation Currently the version pinning for `netty-transport-native-epoll` is not including the native library artifact. That results, depending on the Maven version, to be picking up an earlier version of `transport-native-epoll-4.1.33.Final-linux-x86_64.jar`, where the version is 4.1.33 as opposed to 4.1.43 which is the correct expected version. This results in using Java NIO based transport instead of the more effiecient/performant epoll based one. This affects 2.5.0 as well. --- distribution/server/src/assemble/LICENSE.bin.txt | 3 ++- pom.xml | 14 ++++++++++++++ pulsar-common/pom.xml | 2 ++ pulsar-sql/presto-distribution/LICENSE | 3 ++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index a091bd3..802b954 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -360,9 +360,10 @@ The Apache Software License, Version 2.0 - io.netty-netty-resolver-4.1.43.Final.jar - io.netty-netty-resolver-dns-4.1.43.Final.jar - io.netty-netty-transport-4.1.43.Final.jar - - io.netty-netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar + - io.netty-netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar - io.netty-netty-transport-native-epoll-4.1.43.Final.jar - io.netty-netty-transport-native-unix-common-4.1.43.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.26.Final.jar * Prometheus client - io.prometheus-simpleclient-0.5.0.jar diff --git a/pom.xml b/pom.xml index 7768efb..91c2e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -473,12 +473,26 @@ flexible messaging model and an intuitive client API.</description> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> <version>${netty.version}</version> + <classifier>linux-x86_64</classifier> + </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <version>${netty.version}</version> + </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + <version>${netty.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-unix-common</artifactId> <version>${netty.version}</version> + <classifier>linux-x86_64</classifier> </dependency> <!-- `netty-codec-http2` is a dependency of grpc, set the version to diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index 8357b94..ad53ab8 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -81,11 +81,13 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> + <classifier>linux-x86_64</classifier> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-unix-common</artifactId> + <classifier>linux-x86_64</classifier> </dependency> <dependency> diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 601dba5..8542df9 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -248,8 +248,9 @@ The Apache Software License, Version 2.0 - netty-tcnative-boringssl-static-2.0.26.Final.jar - netty-transport-4.1.43.Final.jar - netty-transport-native-epoll-4.1.43.Final.jar - - netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar + - netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar - netty-transport-native-unix-common-4.1.43.Final.jar + - netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar * Joda Time - joda-time-2.9.9.jar - joda-time-2.10.1.jar
