Skip to content
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

[FLINK-30232][Build/Shaded] Include all platforms incl ARM64 while shading Netty #118

Merged
merged 2 commits into from Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions flink-shaded-netty-4/pom.xml
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions flink-shaded-netty-tcnative-static/pom.xml
Expand Up @@ -87,12 +87,12 @@ under the License.
<phase>package</phase>
<configuration>
<target>
<echo message="unpacking netty jar" />
<echo message="unpacking static tcnative netty jar" />
<unzip src="${project.build.directory}/${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />
<echo message="renaming netty_tcnative library" />
<move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
<fileset dir="${project.build.directory}/unpacked/META-INF/native"/>
<mapper type="regexp" from="(lib)?netty_tcnative_(linux_x86_64.so|linux_aarch_64.so|osx_x86_64.jnilib|windows_x86_64.dll)" to="\1org_apache_flink_shaded_netty4_netty_tcnative_\2"/>
<mapper type="regexp" from="(lib)?netty_tcnative_(.*)" to="\1org_apache_flink_shaded_netty4_netty_tcnative_\2"/>
</move>
<echo message="repackaging netty jar" />
<jar destfile="${project.build.directory}/${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />
Expand Down