From 5bd6611c0e1c9249093ca2d200c07574781203b5 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Wed, 9 Sep 2020 09:50:36 +0200 Subject: [PATCH] =?UTF-8?q?Explicit=20need=20to=20specify=20-Piouring-nati?= =?UTF-8?q?ve=20to=20compile=20the=20native=20bits=20=E2=80=A6=20(#10546)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Motivation: At the moment our CI can not build and run the native bits for the iouring transport so we should just not compile this at the moment. The java classes itself should still be compiled tho Modifications: Add explicit profile to compile native bits of iouring Result: CI passes with iouring transport --- example/pom.xml | 6 - transport-native-io_uring/pom.xml | 218 +----------------- .../uring/example}/EchoIOUringServer.java | 3 +- .../example}/EchoIOUringServerHandler.java | 4 +- 4 files changed, 4 insertions(+), 227 deletions(-) rename {example/src/main/java/io/netty/example/uring => transport-native-io_uring/src/test/java/io/netty/channel/uring/example}/EchoIOUringServer.java (98%) rename {example/src/main/java/io/netty/example/uring => transport-native-io_uring/src/test/java/io/netty/channel/uring/example}/EchoIOUringServerHandler.java (97%) diff --git a/example/pom.xml b/example/pom.xml index b56e77b9cb..708897cf9e 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -43,12 +43,6 @@ netty-buffer ${project.version} - - ${project.groupId} - netty-transport-native-io_uring - ${project.version} - linux-x86_64 - ${project.groupId} netty-transport diff --git a/transport-native-io_uring/pom.xml b/transport-native-io_uring/pom.xml index eba2457255..cf8a5043a7 100644 --- a/transport-native-io_uring/pom.xml +++ b/transport-native-io_uring/pom.xml @@ -44,76 +44,8 @@ - - restricted-release-io_uring - - - - - maven-enforcer-plugin - 1.4.1 - - - - com.ceilfors.maven.plugin - enforcer-rules - 1.2.0 - - - - - - - - maven-enforcer-plugin - - - enforce-release-environment - - enforce - - - - - - Release process must be performed on linux-x86_64. - - os.detected.classifier - ^linux-x86_64$ - - - - Release process must be performed on RHEL 6.8 or its derivatives. - - - /etc/redhat-release - - release 6.9 - - - - - - - - - - - linux - - - linux - - + iouring-native false @@ -199,154 +131,6 @@ - - - io.netty - netty-transport-native-unix-common - ${project.version} - ${jni.classifier} - - true - - - - - linux-aarch64 - - ${os.detected.name}-aarch64 - - - - - - maven-enforcer-plugin - 1.4.1 - - - - com.ceilfors.maven.plugin - enforcer-rules - 1.2.0 - - - - - - - - maven-enforcer-plugin - - - enforce-release-environment - - enforce - - - - - - Cross compile and Release process must be performed on linux-x86_64. - - os.detected.classifier - ^linux-x86_64.* - - - - Cross compile and Release process must be performed on RHEL 7.6 or its derivatives. - - - /etc/redhat-release - - release 7.6 - - - - - - - - maven-dependency-plugin - - - - unpack - generate-sources - - unpack-dependencies - - - ${project.groupId} - netty-transport-native-unix-common - ${jni.classifier} - ${unix.common.lib.dir} - META-INF/native/** - false - true - - - - - - - org.fusesource.hawtjni - maven-hawtjni-plugin - - - build-native-lib - - netty_transport_native_io_uring_aarch_64 - ${nativeSourceDirectory} - ${project.build.outputDirectory} - - . - - ${jni.compiler.args.ldflags} - ${jni.compiler.args.cflags} - --libdir=${project.build.directory}/native-build/target/lib - --host=aarch64-linux-gnu - - - - generate - build - - - - - - maven-jar-plugin - - - - native-jar - - jar - - - - - true - - - META-INF/native/libnetty_transport_native_io_uring_aarch_64.so; osname=Linux; processor=aarch_64,* - ${javaModuleName} - - true - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - ${jni.classifier} - - - - - - - io.netty diff --git a/example/src/main/java/io/netty/example/uring/EchoIOUringServer.java b/transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServer.java similarity index 98% rename from example/src/main/java/io/netty/example/uring/EchoIOUringServer.java rename to transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServer.java index 23afca30d3..ead233f47c 100644 --- a/example/src/main/java/io/netty/example/uring/EchoIOUringServer.java +++ b/transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServer.java @@ -13,10 +13,9 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.example.uring; +package io.netty.channel.uring.example; import io.netty.bootstrap.ServerBootstrap; - import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/example/src/main/java/io/netty/example/uring/EchoIOUringServerHandler.java b/transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServerHandler.java similarity index 97% rename from example/src/main/java/io/netty/example/uring/EchoIOUringServerHandler.java rename to transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServerHandler.java index 5828df91fe..d203843dd3 100644 --- a/example/src/main/java/io/netty/example/uring/EchoIOUringServerHandler.java +++ b/transport-native-io_uring/src/test/java/io/netty/channel/uring/example/EchoIOUringServerHandler.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.example.uring; -import io.netty.channel.ChannelInboundHandlerAdapter; +package io.netty.channel.uring.example; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; //temporary prototype example @Sharable