From 5728e0eb2cf0d2fe267d25c9f85a0a061dc7ab5f Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Tue, 14 Feb 2017 20:54:28 +0100
Subject: [PATCH] Use the correct arguments when run with jdk9

Motivation:

We need to pass special arguments to run with jdk9 as otherwise some tests will not be able to run.

Modifications:

Allow to define extra arguments when running with jdk9

Result:

Tests pass with jdk9
---
 handler/pom.xml                | 5 +++++
 pom.xml                        | 3 ++-
 testsuite/pom.xml              | 2 ++
 transport-native-epoll/pom.xml | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/handler/pom.xml b/handler/pom.xml
index 225e56832c..2916283655 100644
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -26,6 +26,11 @@
   <artifactId>netty-handler</artifactId>
   <packaging>jar</packaging>
 
+  <properties> 
+    <!-- Needed for SelfSignedCertificate -->
+    <argLine.java9.extras>--add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9.extras>
+  </properties>
+
   <name>Netty/Handler</name>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 500c9e3fb3..d19c674fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,9 @@
     <profile>
       <id>java9</id>
       <properties>
+        <argLine.java9.extras></argLine.java9.extras>
         <!-- Export some stuff which is used during our tests -->
-        <argLine.java9>--add-modules java.xml.bind --add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9>
+        <argLine.java9>--add-modules java.xml.bind ${argLine.java9.extras}</argLine.java9>
         <!-- Not use alpn agent as Java9 supports alpn out of the box -->
         <argLine.alpnAgent />
         <!-- This is needed as earlier ASM versions not support java9 -->
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 61ccbe3008..eab1e48b84 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -88,6 +88,8 @@
 
   <properties>
     <skipAutobahnTestsuite>false</skipAutobahnTestsuite>
+    <!-- Needed for SSL tests as these use the SelfSignedCertificate --> 
+    <argLine.java9.extras>--add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9.extras>
   </properties>
 
   <profiles>
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index 909c0f34bb..2028c5d85a 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -28,6 +28,8 @@
 
   <properties>
     <jni.compiler.args.ldflags>LDFLAGS=-Wl,--no-as-needed -lrt</jni.compiler.args.ldflags>
+    <!-- Needed by the native transport as we need the memoryAddress of the ByteBuffer -->
+    <argLine.java9.extras>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine.java9.extras>
   </properties>
 
   <dependencies>