diff --git a/docker/docker-compose.centos-6.112.yaml b/docker/docker-compose.centos-6.112.yaml index 08b54114a9..86a97a5ce8 100644 --- a/docker/docker-compose.centos-6.112.yaml +++ b/docker/docker-compose.centos-6.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "openjdk@1.12.0-27" + java_version : "openjdk@1.12.0" test: image: netty:centos-6-1.12 diff --git a/docker/docker-compose.centos-6.113.yaml b/docker/docker-compose.centos-6.113.yaml index c8260673b5..78cf6c82ba 100644 --- a/docker/docker-compose.centos-6.113.yaml +++ b/docker/docker-compose.centos-6.113.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "openjdk@1.13.0-3" + java_version : "openjdk@1.13.0-9" test: image: netty:centos-6-1.13 diff --git a/docker/docker-compose.centos-7.112.yaml b/docker/docker-compose.centos-7.112.yaml index b85a1d6e5a..627e8d34a0 100644 --- a/docker/docker-compose.centos-7.112.yaml +++ b/docker/docker-compose.centos-7.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "openjdk@1.12.0-27" + java_version : "openjdk@1.12.0" test: image: netty:centos-7-1.12 diff --git a/docker/docker-compose.centos-7.113.yaml b/docker/docker-compose.centos-7.113.yaml index e49a045b1d..d05d70a158 100644 --- a/docker/docker-compose.centos-7.113.yaml +++ b/docker/docker-compose.centos-7.113.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "openjdk@1.13.0-3" + java_version : "openjdk@1.13.0-9" test: image: netty:centos-7-1.13 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 1148a0a06f..37b2e39176 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java @@ -2195,7 +2195,14 @@ public abstract class SSLEngineTest { assertEquals(SSLEngineResult.Status.CLOSED, result.getStatus()); // Need an UNWRAP to read the response of the close_notify - assertEquals(SSLEngineResult.HandshakeStatus.NEED_UNWRAP, result.getHandshakeStatus()); + if (PlatformDependent.javaVersion() >= 12 && sslClientProvider() == SslProvider.JDK) { + // This is a workaround for a possible JDK12+ bug. + // + // See http://mail.openjdk.java.net/pipermail/security-dev/2019-February/019406.html. + assertEquals(SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, result.getHandshakeStatus()); + } else { + assertEquals(SSLEngineResult.HandshakeStatus.NEED_UNWRAP, result.getHandshakeStatus()); + } int produced = result.bytesProduced(); int consumed = result.bytesConsumed();