From 6f52fbeac6dd2eec8e7dc0368ba0901874d7b03a Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 2 Jan 2018 21:19:24 -0500 Subject: [PATCH] Enable Wildfly tests on JDK 9 and JDK 10 Previously we disabled these tests on JDK 9 and JDK 10 because Wildfly 10 did not support JDK 9 and JDK 10. With the release of Wildfly 11 supporting JDK 9 and JDK 10 and now that we depend on Wildfly 11 in these tests, we can enable these tests on JDK 9 and JDK 10. Relates #28042 --- qa/wildfly/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle index 8c6d59548b0..b55aa68573c 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -84,7 +84,7 @@ task deploy(type: Copy) { } task writeElasticsearchProperties { - onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8 } + onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) } dependsOn 'integTestCluster#wait', deploy doLast { final File elasticsearchProperties = file("${wildflyInstall}/standalone/configuration/elasticsearch.properties") @@ -177,7 +177,7 @@ task stopWildfly(type: LoggedExec) { commandLine "${wildflyInstall}/bin/jboss-cli.sh", "--controller=localhost:${-> managementPort}", "--connect", "command=shutdown" } -if (!Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8) { +if (!Os.isFamily(Os.FAMILY_WINDOWS)) { integTestRunner.dependsOn(configureTransportClient) final TaskExecutionAdapter logDumpListener = new TaskExecutionAdapter() { @Override