Skip to content

Commit 6f52fbe

Browse files
authored
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
1 parent 8925dab commit 6f52fbe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

qa/wildfly/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ task deploy(type: Copy) {
8484
}
8585

8686
task writeElasticsearchProperties {
87-
onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8 }
87+
onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) }
8888
dependsOn 'integTestCluster#wait', deploy
8989
doLast {
9090
final File elasticsearchProperties = file("${wildflyInstall}/standalone/configuration/elasticsearch.properties")
@@ -177,7 +177,7 @@ task stopWildfly(type: LoggedExec) {
177177
commandLine "${wildflyInstall}/bin/jboss-cli.sh", "--controller=localhost:${-> managementPort}", "--connect", "command=shutdown"
178178
}
179179

180-
if (!Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8) {
180+
if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
181181
integTestRunner.dependsOn(configureTransportClient)
182182
final TaskExecutionAdapter logDumpListener = new TaskExecutionAdapter() {
183183
@Override

0 commit comments

Comments
 (0)