Skip to content

Commit 8e8e9cc

Browse files
authored
Include classifier in Automatic-Module-Name (#12354)
Motivation: To be able to have multiple native versions (for different architectures) on the classpath we need to include the classifier in the module name Modifications: Add classifier in the module name Result: Be able to have native bits for different architectures on the classpath when using modules
1 parent 2a9b2cc commit 8e8e9cc

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

resolver-dns-native-macos/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142

143143
<!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
144144
<jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
145+
<javaModuleNameClassifier>${os.detected.name}.aarch_64</javaModuleNameClassifier>
145146
<skipTests>true</skipTests>
146147
</properties>
147148
<build>
@@ -244,7 +245,8 @@
244245
</profiles>
245246

246247
<properties>
247-
<javaModuleName>io.netty.resolver.dns.macos</javaModuleName>
248+
<javaModuleNameClassifier>${os.detected.name}.${os.detected.arch}</javaModuleNameClassifier>
249+
<javaModuleName>io.netty.resolver.dns.macos.${javaModuleNameClassifier}</javaModuleName>
248250
<!-- Needed as we use SelfSignedCertificate in our tests -->
249251
<unix.common.lib.name>netty-unix-common</unix.common.lib.name>
250252
<unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir>

transport-native-epoll/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
<packaging>jar</packaging>
2828

2929
<properties>
30-
<javaModuleName>io.netty.transport.epoll</javaModuleName>
30+
<javaModuleNameClassifier>${os.detected.name}.${os.detected.arch}</javaModuleNameClassifier>
31+
<javaModuleName>io.netty.transport.epoll.${javaModuleNameClassifier}</javaModuleName>
3132
<!-- Needed as we use SelfSignedCertificate in our tests -->
3233
<argLine.java9.extras>--add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9.extras>
3334
<unix.common.lib.name>netty-unix-common</unix.common.lib.name>
@@ -219,6 +220,7 @@
219220
<properties>
220221
<!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
221222
<jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
223+
<javaModuleNameClassifier>${os.detected.name}.aarch_64</javaModuleNameClassifier>
222224
</properties>
223225
<build>
224226
<pluginManagement>

transport-native-kqueue/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
<properties>
143143
<!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
144144
<jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
145+
<javaModuleNameClassifier>${os.detected.name}.aarch_64</javaModuleNameClassifier>
145146
<jni.compiler.args.cflags>CFLAGS=-target arm64-apple-macos11 -O3 -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</jni.compiler.args.cflags>
146147
<jni.compiler.args.ldflags>LDFLAGS=-arch arm64 -Wl,-weak_library,${unix.common.lib.unpacked.dir}/lib${unix.common.lib.name}.a -Wl,-platform_version,macos,11.0,11.0</jni.compiler.args.ldflags>
147148
<skipTests>true</skipTests>
@@ -477,7 +478,8 @@
477478
</profiles>
478479

479480
<properties>
480-
<javaModuleName>io.netty.transport.kqueue</javaModuleName>
481+
<javaModuleNameClassifier>${os.detected.name}.${os.detected.arch}</javaModuleNameClassifier>
482+
<javaModuleName>io.netty.transport.kqueue.${javaModuleNameClassifier}</javaModuleName>
481483
<!-- Needed as we use SelfSignedCertificate in our tests -->
482484
<argLine.java9.extras>--add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9.extras>
483485
<unix.common.lib.name>netty-unix-common</unix.common.lib.name>

0 commit comments

Comments
 (0)