mirror of https://github.com/jwtk/jjwt.git
Merge pull request #370 from jwtk/364-jdk9-module-testing
Re-enable builds on JDK 9+
This commit is contained in:
commit
4085229152
|
@ -5,15 +5,12 @@ language: java
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk7
|
- openjdk7
|
||||||
- oraclejdk8
|
- oraclejdk8
|
||||||
# - oraclejdk9
|
- oraclejdk9
|
||||||
# - oraclejdk10
|
- oraclejdk10
|
||||||
# - openjdk10
|
- openjdk10
|
||||||
# - openjdk11
|
|
||||||
# - oraclejdk-ea
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- export BUILD_COVERAGE="$([ $TRAVIS_JDK_VERSION == 'oraclejdk8' ] && echo 'true')"
|
- export BUILD_COVERAGE="$([ $TRAVIS_JDK_VERSION == 'oraclejdk8' ] && echo 'true')"
|
||||||
# - if [[ "$TRAVIS_JDK_VERSION" != 'openjdk7' && "$TRAVIS_JDK_VERSION" != 'oraclejdk8' ]]; then export MAVEN_OPTS='--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED'; fi;
|
|
||||||
|
|
||||||
install: true
|
install: true
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@ import io.jsonwebtoken.io.Decoder;
|
||||||
import io.jsonwebtoken.io.Decoders;
|
import io.jsonwebtoken.io.Decoders;
|
||||||
import io.jsonwebtoken.io.Encoder;
|
import io.jsonwebtoken.io.Encoder;
|
||||||
import io.jsonwebtoken.io.Serializer;
|
import io.jsonwebtoken.io.Serializer;
|
||||||
|
import io.jsonwebtoken.security.InvalidKeyException;
|
||||||
import io.jsonwebtoken.security.Keys;
|
import io.jsonwebtoken.security.Keys;
|
||||||
|
|
||||||
import java.security.InvalidKeyException;
|
|
||||||
import java.security.Key;
|
import java.security.Key;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
23
pom.xml
23
pom.xml
|
@ -95,15 +95,16 @@
|
||||||
<bouncycastle.version>1.60</bouncycastle.version>
|
<bouncycastle.version>1.60</bouncycastle.version>
|
||||||
|
|
||||||
<!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: -->
|
<!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: -->
|
||||||
<groovy.version>2.4.15</groovy.version>
|
<groovy.version>2.5.1</groovy.version>
|
||||||
<logback.version>1.2.3</logback.version>
|
<logback.version>1.2.3</logback.version>
|
||||||
<easymock.version>3.5</easymock.version>
|
<easymock.version>3.6</easymock.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.12</junit.version>
|
||||||
<powermock.version>2.0.0-beta.5</powermock.version> <!-- necessary for Java 9 support -->
|
<powermock.version>2.0.0-beta.5</powermock.version> <!-- necessary for Java 9 support -->
|
||||||
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
|
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
|
||||||
<surefire.plugin.version>2.22.0</surefire.plugin.version>
|
<surefire.plugin.version>2.22.0</surefire.plugin.version>
|
||||||
<clover.version>4.2.1</clover.version>
|
<clover.version>4.2.1</clover.version>
|
||||||
<clover.db>${jjwt.root}/target/clover/clover.db</clover.db>
|
<clover.db>${jjwt.root}/target/clover/clover.db</clover.db>
|
||||||
|
<surefire.argLine></surefire.argLine>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -166,7 +167,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy-all</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
<version>${groovy.version}</version>
|
<version>${groovy.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -301,16 +302,18 @@
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy-all</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
<version>${groovy.version}</version>
|
<version>${groovy.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- Override OSS parent to support Java 9. Doesn't hurt Java 8 -->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${surefire.plugin.version}</version>
|
<version>${surefire.plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<argLine>${surefire.argLine}</argLine>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
@ -452,6 +455,16 @@
|
||||||
<additionalparam>-Xdoclint:none</additionalparam>
|
<additionalparam>-Xdoclint:none</additionalparam>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<!-- Added profile to address https://github.com/jwtk/jjwt/issues/364 -->
|
||||||
|
<id>jdk9AndLater</id>
|
||||||
|
<activation>
|
||||||
|
<jdk>[1.9,)</jdk>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<surefire.argLine>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED</surefire.argLine>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>sign</id>
|
<id>sign</id>
|
||||||
<build>
|
<build>
|
||||||
|
|
Loading…
Reference in New Issue