From 286176be65cf3aed7d996d33a4c05be0770265d6 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 15 Dec 2020 12:47:51 +0100 Subject: [PATCH] Fix Bundle-NativeCode in MANIFEST file on macOS (#10865) Motivation: We did include some extra " in the Bundle-NativeCode line on macOS. Modifications: Remove " Result: Fixes https://github.com/netty/netty/issues/10856 --- resolver-dns-native-macos/pom.xml | 2 +- transport-native-kqueue/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resolver-dns-native-macos/pom.xml b/resolver-dns-native-macos/pom.xml index 136fccc433..0352163789 100644 --- a/resolver-dns-native-macos/pom.xml +++ b/resolver-dns-native-macos/pom.xml @@ -105,7 +105,7 @@ true - META-INF/native/libnetty_resolver_dns_native_macos_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch}" + META-INF/native/libnetty_resolver_dns_native_macos_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch} ${javaModuleName} true diff --git a/transport-native-kqueue/pom.xml b/transport-native-kqueue/pom.xml index 9cfe045bf8..b0e0a1a246 100644 --- a/transport-native-kqueue/pom.xml +++ b/transport-native-kqueue/pom.xml @@ -110,7 +110,7 @@ true - META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch}" + META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch} ${javaModuleName} true @@ -217,7 +217,7 @@ true - META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=OpenBSD, processor=${os.detected.arch}" + META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=OpenBSD, processor=${os.detected.arch} true ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -323,7 +323,7 @@ true - META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=FreeBSD, processor=${os.detected.arch}" + META-INF/native/libnetty_transport_native_kqueue_${os.detected.arch}.jnilib; osname=FreeBSD, processor=${os.detected.arch} true ${project.build.outputDirectory}/META-INF/MANIFEST.MF