Use final java 11 release and fix test excludes

This commit is contained in:
Tyler Benson 2018-10-01 16:14:14 -04:00
parent cf9f2483f1
commit 335af8c5f1
2 changed files with 11 additions and 5 deletions

View File

@ -140,7 +140,7 @@ jobs:
environment:
- JAVA11_HOME: /usr/lib/jvm/jdk-11
- TEST_TASK: testJava11 latestDepTestJava11
- INSTALL_OPENJDK: https://download.java.net/java/early_access/jdk11/28/GPL/openjdk-11+28_linux-x64_bin.tar.gz
- INSTALL_OPENJDK: https://download.java.net/java/ga/jdk11/openjdk-11_linux-x64_bin.tar.gz
agent_integration_tests:
<<: *defaults

View File

@ -147,16 +147,22 @@ tasks.withType(Test) {
def cloned = it
[7,9,10,11]. each { i ->
[7, 9, 10, 11].each { i ->
def javaHome = System.getenv("JAVA${i}_HOME")
if (javaHome != null) {
def test = task "${cloned.name}Java${i}"(type: cloned.class) {
group = "Verification"
description "Runs $cloned.name under Java ${i}"
executable = "$javaHome/bin/java"
afterEvaluate {
exclude project.testJava8Only
exclude project.testJava8Minimum
if (i == 7) {
afterEvaluate {
exclude project.testJava8Only
exclude project.testJava8Minimum
}
} else if (i > 8) {
afterEvaluate {
exclude project.testJava8Only
}
}
}
tasks.check.dependsOn test