diff --git a/pom.xml b/pom.xml index 5f056eb..73d16c0 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ - 3.0.2 + 3.6.0 @@ -79,8 +79,17 @@ ${target.jdk} ${target.jdk} - - + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.2 + + --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true + + + + @@ -125,12 +134,25 @@ test - - junit - junit - ${junit.version} - test - + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + org.jboss.xnio xnio-nio @@ -147,10 +169,10 @@ 1.8 - 4.1.34.Final - 3.7.1.Final + 4.1.100.Final + 3.8.12.Final 3.4.0.Final - 4.12 + 5.9.0 diff --git a/src/test/java/org/xnio/netty/transport/XnioSocketFileRegionTest.java b/src/test/java/org/xnio/netty/transport/XnioSocketFileRegionTest.java index bc591e1..f6f5bdf 100644 --- a/src/test/java/org/xnio/netty/transport/XnioSocketFileRegionTest.java +++ b/src/test/java/org/xnio/netty/transport/XnioSocketFileRegionTest.java @@ -21,15 +21,16 @@ import io.netty.buffer.ByteBufAllocator; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketFileRegionTest; -import org.junit.Ignore; + import java.util.List; +import org.junit.jupiter.api.Disabled; /** * * @author Norman Maurer */ -@Ignore("Test hangs") +@Disabled("Test hangs") public class XnioSocketFileRegionTest extends SocketFileRegionTest { @Override protected List newAllocators() { diff --git a/src/test/java/org/xnio/netty/transport/XnioSocketSslEchoTest.java b/src/test/java/org/xnio/netty/transport/XnioSocketSslEchoTest.java index 27e0d7c..cdc5a1f 100644 --- a/src/test/java/org/xnio/netty/transport/XnioSocketSslEchoTest.java +++ b/src/test/java/org/xnio/netty/transport/XnioSocketSslEchoTest.java @@ -21,7 +21,6 @@ import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBufAllocator; -import io.netty.handler.ssl.SslContext; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketSslEchoTest; @@ -31,14 +30,6 @@ * @author Flavia Rainone */ public class XnioSocketSslEchoTest extends SocketSslEchoTest { - public XnioSocketSslEchoTest( - SslContext serverCtx, SslContext clientCtx, Renegotiation renegotiation, - boolean serverUsesDelegatedTaskExecutor, boolean clientUsesDelegatedTaskExecutor, - boolean autoRead, boolean useChunkedWriteHandler, boolean useCompositeByteBuf) { - super(serverCtx, clientCtx, renegotiation, serverUsesDelegatedTaskExecutor, clientUsesDelegatedTaskExecutor, - autoRead, useChunkedWriteHandler, useCompositeByteBuf); - } - @Override protected List newAllocators() { return XnioTestsuiteUtils.newAllocators(super.newAllocators()); diff --git a/src/test/java/org/xnio/netty/transport/XnioSocketStartTlsTest.java b/src/test/java/org/xnio/netty/transport/XnioSocketStartTlsTest.java index 1ce1509..d5c44ef 100644 --- a/src/test/java/org/xnio/netty/transport/XnioSocketStartTlsTest.java +++ b/src/test/java/org/xnio/netty/transport/XnioSocketStartTlsTest.java @@ -19,11 +19,9 @@ import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBufAllocator; -import io.netty.handler.ssl.SslContext; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketStartTlsTest; - import java.util.List; /** @@ -32,12 +30,8 @@ * @author Flavia Rainone */ public class XnioSocketStartTlsTest extends SocketStartTlsTest { - - public XnioSocketStartTlsTest(SslContext serverCtx, SslContext clientCtx) { - super(serverCtx, clientCtx); - } - @Override + @Override protected List newAllocators() { return XnioTestsuiteUtils.newAllocators(super.newAllocators()); }