Merge pull request #9348 from ctomc/jdk9

[jdk9] WFLY-3854 use posix parameter syntax to make launcher happy
wildfly · Nov 7, 2016 · 8aef4f8 · 8aef4f8
2 parents 6af85a2 + ddb4890
commit 8aef4f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6171,15 +6171,17 @@
             </activation>
             <properties>
                 <!-- [WFCORE-1431] remove SASL workaround -->
-                <modular.jdk.args>--add-exports java.security.sasl/com.sun.security.sasl.digest=ALL-UNNAMED
-                    --add-exports java.security.sasl/com.sun.security.sasl=ALL-UNNAMED
-                    --add-exports jdk.unsupported/sun.reflect=ALL-UNNAMED
-                    --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
+                <modular.jdk.args>--add-exports=java.security.sasl/com.sun.security.sasl.digest=ALL-UNNAMED
+                    --add-exports=java.security.sasl/com.sun.security.sasl=ALL-UNNAMED
+                    --add-exports=jdk.unsupported/sun.reflect=ALL-UNNAMED
+                    --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
                 </modular.jdk.args>
                 <!-- [WFCORE-1494] remove JUL workaround -->
                 <modular.jdk.props>-Dsun.util.logging.disableCallerCheck=true</modular.jdk.props>
                 <!-- There are lots of issues with checkstyle runtime on JDK9, it somewhat works but really slows down build, disabling it for now-->
                 <checkstyle.skip>true</checkstyle.skip>
+                <!-- we override javassist to version that works on JDK9 -->
+                <version.org.javassist>3.22.0-CR1</version.org.javassist>
             </properties>
             <build>
                 <plugins>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -1292,8 +1292,8 @@
                 <jdk>9</jdk>
             </activation>
             <properties>
-                <modular.jdk.testsuite.args>${modular.jdk.args} -XaddExports:java.base/sun.security.validator=ALL-UNNAMED
-                     -XaddExports:java.naming/com.sun.jndi.ldap=ALL-UNNAMED</modular.jdk.testsuite.args>
+                <modular.jdk.testsuite.args>${modular.jdk.args} --add-exports=java.base/sun.security.validator=ALL-UNNAMED
+                    --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</modular.jdk.testsuite.args>
             </properties>
         </profile>