From 361ace7671ac0e5afff64a36a6ec0672b50e59e1 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 4 Dec 2018 11:59:10 +0100 Subject: [PATCH] Update to OpenJDK 12 ea22 (#8618) Motivation: We should use the latest OpenJDK 12 release when running tests against Java12. Modifications: - Update to OpenJDK 12 ea22. - Update pax exam version - skip OSGI testsuite on Java12 as it does not work ea22 yet. Result: Use latest OpenJDK 12 version when running on the CI. --- docker/docker-compose.centos-6.112.yaml | 2 +- docker/docker-compose.centos-7.112.yaml | 2 +- pom.xml | 2 ++ testsuite-osgi/pom.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.centos-6.112.yaml b/docker/docker-compose.centos-6.112.yaml index ded410bea7..c49744ca71 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-19" + java_version : "openjdk@1.12.0-22" test: image: netty:centos-6-1.12 diff --git a/docker/docker-compose.centos-7.112.yaml b/docker/docker-compose.centos-7.112.yaml index 9eb4fb1da7..93c05349b9 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-19" + java_version : "openjdk@1.12.0-22" test: image: netty:centos-7-1.12 diff --git a/pom.xml b/pom.xml index 36d17554cb..3ae0c720a1 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,8 @@ 1.7 1.7 + + true diff --git a/testsuite-osgi/pom.xml b/testsuite-osgi/pom.xml index 5046363dfb..2cc977e541 100644 --- a/testsuite-osgi/pom.xml +++ b/testsuite-osgi/pom.xml @@ -29,7 +29,7 @@ Netty/Testsuite/OSGI - 4.9.1 + 4.13.0 --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED