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:09 UTC
[flink-shaded] branch master updated (0cf9196 -> ba56570)
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
from 0cf9196 [FLINK-29915][netty] Build tcnative-static on CI
new b99f4ed [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty
new ba56570 [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty Tcnative Dynamic
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-shaded-netty-4/pom.xml | 9 ++-------
flink-shaded-netty-tcnative-static/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)
[flink-shaded] 02/02: [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty Tcnative Dynamic
Posted by ma...@apache.org.
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 ba56570bbe395385c17240a2119c1c2cf8141675
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Wed Jan 18 11:23:56 2023 +0100
[FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty Tcnative Dynamic
---
flink-shaded-netty-tcnative-static/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index a046f99..fbc5919 100644
--- a/flink-shaded-netty-tcnative-static/pom.xml
+++ b/flink-shaded-netty-tcnative-static/pom.xml
@@ -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" />
[flink-shaded] 01/02: [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty
Posted by ma...@apache.org.
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" />