aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Mandrikov <Godin@users.noreply.github.com>2016-12-15 21:22:14 +0100
committerMarc R. Hoffmann <hoffmann@mountainminds.com>2016-12-15 21:22:14 +0100
commit2bc56b24b66641042e8fdacf846826ffdbdc1a36 (patch)
treed2bb53219e1ec2a081c1c0b5f8fceeb502916130
parent055e8e4c209673f96581b723fcc6295852bf997e (diff)
downloadjacoco-2bc56b24b66641042e8fdacf846826ffdbdc1a36.tar.gz
Fix build failure with JDK 9 EA b148 (#470)
-rwxr-xr-x.travis.sh3
-rw-r--r--org.jacoco.core.test/src/org/jacoco/core/runtime/URLStreamHandlerRuntimeTest.java10
2 files changed, 13 insertions, 0 deletions
diff --git a/.travis.sh b/.travis.sh
index d75ce17d..c391c1c7 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -85,6 +85,9 @@ case "$JDK" in
mvn -V -B -e verify -Dbytecode.version=1.8
;;
9-ea | 9-ea-stable)
+ # Groovy version should be updated to get rid of "--add-opens" options (see https://twitter.com/CedricChampeau/status/807285853580103684)
+ export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED"
+
# see https://bugs.openjdk.java.net/browse/JDK-8131041 about "java.locale.providers"
mvn -V -B -e verify -Dbytecode.version=1.9 \
-DargLine=-Djava.locale.providers=JRE,SPI
diff --git a/org.jacoco.core.test/src/org/jacoco/core/runtime/URLStreamHandlerRuntimeTest.java b/org.jacoco.core.test/src/org/jacoco/core/runtime/URLStreamHandlerRuntimeTest.java
index 0849f77a..1135548f 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/runtime/URLStreamHandlerRuntimeTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/runtime/URLStreamHandlerRuntimeTest.java
@@ -11,6 +11,9 @@
*******************************************************************************/
package org.jacoco.core.runtime;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+
/**
* Unit tests for {@link URLStreamHandlerRuntime}.
*/
@@ -21,4 +24,11 @@ public class URLStreamHandlerRuntimeTest extends RuntimeTestBase {
return new URLStreamHandlerRuntime();
}
+ @BeforeClass
+ public static void checkJDK() {
+ final boolean jdk9 = System.getProperty("java.version")
+ .startsWith("9-");
+ Assume.assumeTrue(!jdk9);
+ }
+
}