You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/01/19 09:12:10 UTC

[flink-shaded] 01/02: [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty

This is an automated email from the ASF dual-hosted git repository.

martijnvisser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git

commit b99f4edc315e16ce95392b5e99788d79f006e2a9
Author: Martijn Visser <ma...@apache.org>
AuthorDate: Wed Dec 21 11:58:53 2022 +0100

    [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty
---
 flink-shaded-netty-4/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 83e58c2..d223cc8 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -91,15 +91,10 @@ under the License.
                             <target>
                                 <echo message="unpacking netty jar" />
                                 <unzip src="${project.build.directory}/${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />
-                                <echo message="renaming native epoll library" />
+                                <echo message="renaming the complete libnetty library" />
                                 <move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
                                     <fileset dir="${project.build.directory}/unpacked/META-INF/native"/>
-                                    <mapper type="glob" from="libnetty_transport_native_epoll_x86_64.so" to="liborg_apache_flink_shaded_netty4_netty_transport_native_epoll_x86_64.so"/>
-                                </move>
-                                <echo message="renaming native kqueue library" />
-                                <move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
-                                    <fileset dir="${project.build.directory}/unpacked/META-INF/native"/>
-                                    <mapper type="glob" from="libnetty_transport_native_kqueue_x86_64.jnilib" to="liborg_apache_flink_shaded_netty4_netty_transport_native_kqueue_x86_64.jnilib"/>
+                                    <mapper type="glob" from="libnetty*" to="liborg_apache_flink_shaded_netty*"/>
                                 </move>
                                 <echo message="repackaging netty jar" />
                                 <jar destfile="${project.build.directory}/${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />