Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make it compile and run tests on recent jdk9 builds #494

Merged
merged 1 commit into from
Sep 15, 2016
Merged

make it compile and run tests on recent jdk9 builds #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOL thanks ;-)

<url>https://github.com/wildfly-security/wildfly-elytron</url>
</scm>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down