andreacavalli
/
netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update JDK12 and 13 to latest EA releases. (#8809) 

Motivation:

We use outdated EA releases when building and testing with JDK 12 and 13.

Modifications:

- Update versions.
- Add workaround for possible JDK12+ bug.

Result:

Use latest releases
This commit is contained in:
Norman Maurer 2019-02-28 13:54:04 +01:00 committed by GitHub
parent 215b61e8e2
commit d3d0b6478b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose.centos-6.112.yaml
View File

@ -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

2
docker/docker-compose.centos-6.113.yaml
View File

@ -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

2
docker/docker-compose.centos-7.112.yaml
View File

@ -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

2
docker/docker-compose.centos-7.113.yaml
View File

@ -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

9
handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
View File

@ -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();