Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java11 #25

Closed
wants to merge 2 commits into from
Closed

Java11 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7020a65
Upgrading netty to 4.1.100.Final and xnio to 3.8.12.Final using junit 5.
ehsavoie Nov 15, 2023
b48f957
Trying to move to Java 11
ehsavoie Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 35 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</distributionManagement>

<prerequisites>
<maven>3.0.2</maven>
<maven>3.6.0</maven>
</prerequisites>

<build>
Expand All @@ -79,8 +79,17 @@
<source>${target.jdk}</source>
<target>${target.jdk}</target>
</configuration>
</plugin>
<plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<argLine> --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true</argLine>
</configuration>
</plugin>

<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand All @@ -98,7 +107,7 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
</plugins>
</build>

Expand All @@ -125,12 +134,25 @@
<!--<type>test-jar</type> -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- Common test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
Expand All @@ -147,10 +169,10 @@

<properties>
<target.jdk>1.8</target.jdk>
<netty.version>4.1.34.Final</netty.version>
<xnio.version>3.7.1.Final</xnio.version>
<netty.version>4.1.100.Final</netty.version>
<xnio.version>3.8.12.Final</xnio.version>
<jboss.logging.version>3.4.0.Final</jboss.logging.version>
<junit.version>4.12</junit.version>
<junit.version>5.9.0</junit.version>
</properties>


Expand Down
5 changes: 3 additions & 2 deletions src/test/java/org/xnio/netty/transport/XnioSocketFileRegionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="mailto:[email protected]">Norman Maurer</a>
*/
@Ignore("Test hangs")
@Disabled("Test hangs")
public class XnioSocketFileRegionTest extends SocketFileRegionTest {
@Override
protected List<ByteBufAllocator> newAllocators() {
Expand Down
9 changes: 0 additions & 9 deletions src/test/java/org/xnio/netty/transport/XnioSocketSslEchoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<ByteBufAllocator> newAllocators() {
return XnioTestsuiteUtils.newAllocators(super.newAllocators());
Expand Down
8 changes: 1 addition & 7 deletions src/test/java/org/xnio/netty/transport/XnioSocketStartTlsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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<ByteBufAllocator> newAllocators() {
return XnioTestsuiteUtils.newAllocators(super.newAllocators());
}
Expand Down
Loading