diff --git a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java index a60749837b..d67e7a8129 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java @@ -2978,7 +2978,12 @@ public abstract class SSLEngineTest { assertTrue(serverSession.getPacketBufferSize() > 0); assertNotNull(clientSession.getSessionContext()); - assertNotNull(serverSession.getSessionContext()); + + // Workaround for possible JDK 14 regression. + // See http://mail.openjdk.java.net/pipermail/security-dev/2020-March/021488.html + if (PlatformDependent.javaVersion() < 14) { + assertNotNull(serverSession.getSessionContext()); + } Object value = new Object(); diff --git a/pom.xml b/pom.xml index 0b6a4ec84b..2e2b6216e5 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,27 @@ + + + java14 + + 14 + + + + + true + + 3.0.0-M3 + + 2.0.5.Final + + 1.7 + 1.7 + + true + + java13 @@ -104,14 +125,14 @@ 13 - + true - 3.0.0-M1 + 3.0.0-M3 2.0.5.Final - + 1.7 1.7 @@ -129,14 +150,14 @@ --illegal-access=deny ${argLine.java9.extras} - + true - 3.0.0-M1 + 3.0.0-M3 2.0.5.Final - + 1.7 1.7 @@ -154,11 +175,11 @@ --illegal-access=deny ${argLine.java9.extras} - + true - 3.0.0-M1 + 3.0.0-M3 2.0.5.Final @@ -180,7 +201,7 @@ true - 3.0.0-M1 + 3.0.0-M3 2.0.5.Final @@ -680,7 +701,7 @@ io.projectreactor.tools blockhound - 1.0.2.RELEASE + 1.0.3.RELEASE diff --git a/transport-blockhound-tests/pom.xml b/transport-blockhound-tests/pom.xml index 047d2e3e8a..f9c6ee85d1 100644 --- a/transport-blockhound-tests/pom.xml +++ b/transport-blockhound-tests/pom.xml @@ -41,6 +41,15 @@ -XX:+AllowRedefinitionToAddDeleteMethods + + java14 + + 14 + + + -XX:+AllowRedefinitionToAddDeleteMethods + +