This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new cfe643bc9d4 [improve][misc] Allow custom Netty
DnsServerAddressStreamProviders (#18646)
cfe643bc9d4 is described below
commit cfe643bc9d45e74271df6f4d16d46087572e285b
Author: Chris Bono <[email protected]>
AuthorDate: Tue Dec 6 18:26:29 2022 -0600
[improve][misc] Allow custom Netty DnsServerAddressStreamProviders (#18646)
Co-authored-by: tison <[email protected]>
---
distribution/server/src/assemble/LICENSE.bin.txt | 3 +++
pulsar-client/pom.xml | 10 ++++++++++
pulsar-sql/presto-distribution/LICENSE | 3 +++
src/rename-netty-native-libs.sh | 2 ++
4 files changed, 18 insertions(+)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 67eb9c23d49..ea78694f8b8 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -298,6 +298,9 @@ The Apache Software License, Version 2.0
- io.netty-netty-handler-proxy-4.1.77.Final.jar
- io.netty-netty-resolver-4.1.77.Final.jar
- io.netty-netty-resolver-dns-4.1.77.Final.jar
+ - io.netty-netty-resolver-dns-classes-macos-4.1.77.Final.jar
+ - io.netty-netty-resolver-dns-native-macos-4.1.77.Final-osx-aarch_64.jar
+ - io.netty-netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar
- io.netty-netty-transport-4.1.77.Final.jar
- io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index a371b061073..4c0158690c6 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -77,6 +77,16 @@
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <classifier>osx-aarch_64</classifier>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <classifier>osx-x86_64</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 45ddd085244..27b127e8f3a 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -243,6 +243,9 @@ The Apache Software License, Version 2.0
- netty-reactive-streams-2.0.6.jar
- netty-resolver-4.1.77.Final.jar
- netty-resolver-dns-4.1.77.Final.jar
+ - netty-resolver-dns-classes-macos-4.1.77.Final.jar
+ - netty-resolver-dns-native-macos-4.1.77.Final-osx-aarch_64.jar
+ - netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar
- netty-tcnative-boringssl-static-2.0.52.Final.jar
- netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar
- netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar
diff --git a/src/rename-netty-native-libs.sh b/src/rename-netty-native-libs.sh
index 99da5b06542..44b971a02c9 100755
--- a/src/rename-netty-native-libs.sh
+++ b/src/rename-netty-native-libs.sh
@@ -28,6 +28,8 @@ FILE_PREFIX='META-INF/native'
FILES_TO_RENAME=(
'libnetty_transport_native_epoll_x86_64.so
liborg_apache_pulsar_shade_netty_transport_native_epoll_x86_64.so'
'libnetty_tcnative_linux_x86_64.so
liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so'
+ 'libnetty_resolver_dns_native_macos_aarch_64.jnilib
liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_aarch_64.jnilib'
+ 'libnetty_resolver_dns_native_macos_x86_64.jnilib
liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_x86_64.jnilib'
)
echo "----- Renaming epoll lib in $JAR_PATH ------"
