aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2017-09-23 02:36:01 +0200
committerEvgeny Mandrikov <mandrikov@gmail.com>2017-09-23 02:36:01 +0200
commit8cd3247107c1fcc0ef0add631f1f411da902a2bc (patch)
tree83012bc49b4506939a15954073a85bc518ad8620
parent8a2822d1d49a9dab3a85ea3b16113395abc069e9 (diff)
downloadjacoco-8cd3247107c1fcc0ef0add631f1f411da902a2bc.tar.gz
Happy birthday JDK 9!
-rwxr-xr-x.travis.sh11
-rw-r--r--.travis.yml4
-rw-r--r--org.jacoco.doc/docroot/doc/faq.html2
3 files changed, 7 insertions, 10 deletions
diff --git a/.travis.sh b/.travis.sh
index d1da7235..e8411f70 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -49,11 +49,8 @@ case "$JDK" in
8-ea)
install_jdk $JDK8_EA_URL
;;
-9-ea)
- install_jdk $JDK9_EA_URL
- ;;
-9-ea-stable)
- install_jdk $JDK9_EA_STABLE_URL
+9)
+ install_jdk $JDK9_URL
;;
esac
@@ -84,9 +81,11 @@ case "$JDK" in
8 | 8-ea)
mvn -V -B -e verify -Dbytecode.version=1.8 -Decj=${ECJ:-}
;;
-9-ea | 9-ea-stable)
+9)
+ export MAVEN_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
# see https://bugs.openjdk.java.net/browse/JDK-8131041 about "java.locale.providers"
mvn -V -B -e verify -Dbytecode.version=1.9 \
+ -Dinvoker.mavenOpts="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts" \
-DargLine=-Djava.locale.providers=JRE,SPI
;;
*)
diff --git a/.travis.yml b/.travis.yml
index 06bb3931..c76bcda7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,12 +25,10 @@ env:
- JDK=8
ECJ=true
- JDK=8-ea
- - JDK=9-ea
- - JDK=9-ea-stable
+ - JDK=9
matrix:
allow_failures:
- env: JDK=8-ea
- - env: JDK=9-ea
script: ./.travis.sh
diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html
index a1e2e2f9..8eb14e46 100644
--- a/org.jacoco.doc/docroot/doc/faq.html
+++ b/org.jacoco.doc/docroot/doc/faq.html
@@ -31,7 +31,7 @@
<h3>What Java versions are supported by JaCoCo?</h3>
<p>
- JaCoCo supports Java class files from version 1.0 to 1.8. However the minimum
+ JaCoCo supports Java class files from version 1.0 to 9. However the minimum
JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo
tools is 1.5. Also note that class files under test from version 1.6 and above
have to contain valid stackmap frames.