From d05b5190e6e851906980851f0cf92508057275a6 Mon Sep 17 00:00:00 2001
From: Tomaz Cerar <tomaz.cerar@gmail.com>
Date: Fri, 29 Jul 2016 17:06:38 +0200
Subject: [PATCH] make it compile and run tests on recent jdk9 builds

---
 pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5b6b65012f0..a4a9e13bd26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>20</version>
+        <version>21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -49,7 +49,7 @@
     </licenses>
 
     <scm>
-        <connection>svm:git@github.com:wildfly-security/wildfly-elytron.git</connection>
+        <connection>scm:git:git@github.com:wildfly-security/wildfly-elytron.git</connection>
         <url>https://github.com/wildfly-security/wildfly-elytron</url>
     </scm>
 
@@ -83,6 +83,8 @@
 
         <!-- version from jboss-parent is 6.15 but then some checks fail -->
         <version.checkstyle>6.8</version.checkstyle>
+        <!-- Modularized JDK support (various workarounds) - activated via profile -->
+        <modular.jdk.args/>
     </properties>
 
     <build>
@@ -123,12 +125,13 @@
                         </systemPropertyVariables>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <trimStackTrace>false</trimStackTrace>
-                        <printSummary>true</printSummary>
                         <includes>
                             <include>**/*Test.java</include>
                             <include>**/*TestSuite.java</include>
                         </includes>
-                        <forkMode>always</forkMode>
+                        <childDelegation>true</childDelegation>
+                        <reuseForks>false</reuseForks>
+                        <argLine>${modular.jdk.args}</argLine>
                     </configuration>
                 </plugin>
 
@@ -426,6 +429,42 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>modularizedJdk</id>
+            <activation>
+                <jdk>9</jdk>
+            </activation>
+            <properties>
+                <!-- [WFCORE-1431] remove SASL workaround -->
+                <modular.jdk.args>--add-modules java.corba,java.sql --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 java.base/sun.security.x509=ALL-UNNAMED
+                </modular.jdk.args>
+                <!-- 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>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>${version.compiler.plugin}</version>
+                        <configuration>
+                            <!-- fork is needed so compiler args can be used -->
+                            <fork>true</fork>
+                            <compilerArgs>
+                                <arg>-J--add-modules</arg>
+                                <arg>-Jjava.annotations.common</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>public-jboss</id>