diff --git a/all/pom.xml b/all/pom.xml
index 022e695ffce..3eac97a5fb3 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -315,22 +315,21 @@
${project.groupId}
- netty-transport-native-epoll
+ netty-transport-classes-epoll
compile
${project.groupId}
- netty-transport-native-kqueue
+ netty-transport-classes-kqueue
compile
${project.groupId}
- netty-resolver-dns-native-macos
+ netty-resolver-dns-classes-macos
compile
diff --git a/bom/pom.xml b/bom/pom.xml
index 22f03f34686..425ecd7fcb0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -196,6 +196,11 @@
netty-all
${project.version}
+
+ io.netty
+ netty-resolver-dns-classes-macos
+ ${project.version}
+
io.netty
netty-resolver-dns-native-macos
@@ -242,6 +247,11 @@
${project.version}
osx-aarch_64
+
+ io.netty
+ netty-transport-classes-epoll
+ ${project.version}
+
io.netty
netty-transport-native-epoll
@@ -259,6 +269,11 @@
${project.version}
linux-x86_64
+
+ io.netty
+ netty-transport-classes-kqueue
+ ${project.version}
+
io.netty
netty-transport-native-kqueue
diff --git a/pom.xml b/pom.xml
index 304514b6958..f779c157b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -552,11 +552,14 @@
codec-xml
resolver
resolver-dns
+ resolver-dns-classes-macos
resolver-dns-native-macos
transport
transport-native-unix-common-tests
transport-native-unix-common
+ transport-classes-epoll
transport-native-epoll
+ transport-classes-kqueue
transport-native-kqueue
transport-rxtx
transport-sctp
diff --git a/resolver-dns-classes-macos/pom.xml b/resolver-dns-classes-macos/pom.xml
new file mode 100644
index 00000000000..7dcd45f84eb
--- /dev/null
+++ b/resolver-dns-classes-macos/pom.xml
@@ -0,0 +1,59 @@
+
+
+
+ 4.0.0
+
+ io.netty
+ netty-parent
+ 4.1.70.Final-SNAPSHOT
+
+ netty-resolver-dns-classes-macos
+
+ Netty/Resolver/DNS/Classes/MacOS
+ jar
+
+
+ io.netty.resolver.dns.classes.macos
+
+
+
+
+ io.netty
+ netty-common
+ ${project.version}
+
+
+ io.netty
+ netty-resolver-dns
+ ${project.version}
+
+
+ io.netty
+ netty-transport-native-unix-common
+ ${project.version}
+
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+
+
diff --git a/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/DnsResolver.java b/resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/DnsResolver.java
similarity index 100%
rename from resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/DnsResolver.java
rename to resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/DnsResolver.java
diff --git a/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProvider.java b/resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProvider.java
similarity index 100%
rename from resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProvider.java
rename to resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProvider.java
diff --git a/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java b/resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java
similarity index 100%
rename from resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java
rename to resolver-dns-classes-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java
diff --git a/resolver-dns-native-macos/pom.xml b/resolver-dns-native-macos/pom.xml
index 046197e9000..e5f7642348c 100644
--- a/resolver-dns-native-macos/pom.xml
+++ b/resolver-dns-native-macos/pom.xml
@@ -23,7 +23,7 @@
netty-resolver-dns-native-macos
- Netty/Resolver/DNS/MacOS
+ Netty/Resolver/DNS/Native/MacOS
jar
@@ -248,22 +248,13 @@
${unix.common.lib.dir}/META-INF/native/include
CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}
LDFLAGS=-z now -L${unix.common.lib.unpacked.dir} -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive
+ true
io.netty
- netty-common
- ${project.version}
-
-
- io.netty
- netty-resolver-dns
- ${project.version}
-
-
- io.netty
- netty-transport-native-unix-common
+ netty-resolver-dns-classes-macos
${project.version}
diff --git a/transport-classes-epoll/pom.xml b/transport-classes-epoll/pom.xml
new file mode 100644
index 00000000000..9067cf58206
--- /dev/null
+++ b/transport-classes-epoll/pom.xml
@@ -0,0 +1,65 @@
+
+
+
+ 4.0.0
+
+ io.netty
+ netty-parent
+ 4.1.70.Final-SNAPSHOT
+
+ netty-transport-classes-epoll
+
+ Netty/Transport/Classes/Epoll
+ jar
+
+
+ io.netty.transport.classes.epoll
+
+
+
+
+ io.netty
+ netty-common
+ ${project.version}
+
+
+ io.netty
+ netty-buffer
+ ${project.version}
+
+
+ io.netty
+ netty-transport
+ ${project.version}
+
+
+ io.netty
+ netty-transport-native-unix-common
+ ${project.version}
+
+
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+
+
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollServerChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollServerChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollServerChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollServerChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/Epoll.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/Epoll.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/Epoll.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/Epoll.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollChannelOption.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollChannelOption.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollChannelOption.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollChannelOption.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainDatagramChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventArray.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventArray.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventArray.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventArray.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollMode.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollMode.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollMode.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollMode.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerDomainSocketChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerDomainSocketChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerDomainSocketChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerDomainSocketChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannelConfig.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannelConfig.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannelConfig.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannelConfig.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollTcpInfo.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollTcpInfo.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollTcpInfo.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/EpollTcpInfo.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/Native.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/Native.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/Native.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/Native.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/NativeDatagramPacketArray.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/NativeDatagramPacketArray.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/NativeDatagramPacketArray.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/NativeDatagramPacketArray.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/SegmentedDatagramPacket.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/SegmentedDatagramPacket.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/SegmentedDatagramPacket.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/SegmentedDatagramPacket.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/package-info.java b/transport-classes-epoll/src/main/java/io/netty/channel/epoll/package-info.java
similarity index 100%
rename from transport-native-epoll/src/main/java/io/netty/channel/epoll/package-info.java
rename to transport-classes-epoll/src/main/java/io/netty/channel/epoll/package-info.java
diff --git a/transport-classes-kqueue/pom.xml b/transport-classes-kqueue/pom.xml
new file mode 100644
index 00000000000..8ddfe427feb
--- /dev/null
+++ b/transport-classes-kqueue/pom.xml
@@ -0,0 +1,64 @@
+
+
+
+ 4.0.0
+
+ io.netty
+ netty-parent
+ 4.1.70.Final-SNAPSHOT
+
+ netty-transport-classes-kqueue
+
+ Netty/Transport/Classes/KQueue
+ jar
+
+
+ io.netty.transport.classes.kqueue
+
+
+
+
+ io.netty
+ netty-common
+ ${project.version}
+
+
+ io.netty
+ netty-buffer
+ ${project.version}
+
+
+ io.netty
+ netty-transport
+ ${project.version}
+
+
+ io.netty
+ netty-transport-native-unix-common
+ ${project.version}
+
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+
+
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueDatagramChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueDatagramChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueDatagramChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueDatagramChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueServerChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueServerChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueServerChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueServerChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueStreamChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueStreamChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueStreamChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueStreamChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AcceptFilter.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AcceptFilter.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AcceptFilter.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/AcceptFilter.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/BsdSocket.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/BsdSocket.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/BsdSocket.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/BsdSocket.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueue.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueue.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueue.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueue.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelOption.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelOption.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelOption.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueChannelOption.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainDatagramChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventArray.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventArray.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventArray.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventArray.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoop.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoop.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoop.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoop.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoopGroup.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoopGroup.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoopGroup.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueEventLoopGroup.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueRecvByteAllocatorHandle.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueRecvByteAllocatorHandle.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueRecvByteAllocatorHandle.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueRecvByteAllocatorHandle.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerDomainSocketChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerDomainSocketChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerDomainSocketChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerDomainSocketChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueServerSocketChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannel.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannel.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannel.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannel.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannelConfig.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannelConfig.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannelConfig.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueSocketChannelConfig.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueStaticallyReferencedJniMethods.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueStaticallyReferencedJniMethods.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueStaticallyReferencedJniMethods.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/KQueueStaticallyReferencedJniMethods.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/Native.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/Native.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/Native.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/Native.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/NativeLongArray.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/NativeLongArray.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/NativeLongArray.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/NativeLongArray.java
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/package-info.java b/transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/package-info.java
similarity index 100%
rename from transport-native-kqueue/src/main/java/io/netty/channel/kqueue/package-info.java
rename to transport-classes-kqueue/src/main/java/io/netty/channel/kqueue/package-info.java
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index 4fde753f570..ae92265b511 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -38,6 +38,7 @@
LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -ldl -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive
${project.basedir}/src/main/c
true
+ true
@@ -383,6 +384,11 @@
netty-transport-native-unix-common
${project.version}
+
+ io.netty
+ netty-transport-classes-epoll
+ ${project.version}
+
io.netty
netty-testsuite
diff --git a/transport-native-kqueue/pom.xml b/transport-native-kqueue/pom.xml
index 2a04f156694..9d66c3e2b2a 100644
--- a/transport-native-kqueue/pom.xml
+++ b/transport-native-kqueue/pom.xml
@@ -468,6 +468,7 @@
LDFLAGS=-z now -L${unix.common.lib.unpacked.dir} -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive
${project.basedir}/src/main/c
true
+ true
@@ -491,6 +492,11 @@
netty-transport-native-unix-common
${project.version}
+
+ io.netty
+ netty-transport-classes-kqueue
+ ${project.version}
+
io.netty
netty-testsuite