From c5396839c4bd720980308a9d532d9f955323f489 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Sat, 22 Apr 2017 10:41:57 -0400
Subject: [PATCH] Skip Wildfly tests on JDK 9

It seems that Wildfly 10 can not be made to start in a fully-functional
form on JDK 9, so this commit skips running the Wildfly integration
tests on JDK 9.
---
 qa/wildfly/build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle
index 080e460e4f6..fe5e9d47a5f 100644
--- a/qa/wildfly/build.gradle
+++ b/qa/wildfly/build.gradle
@@ -35,7 +35,7 @@ final String wildflyInstall = "${buildDir}/wildfly/wildfly-${wildflyVersion}"
 // TODO: use ephemeral ports
 final int portOffset = 30000
 final int managementPort = 9990 + portOffset
-// we skip these tests on Windows so we do no need to worry about compatibility here
+// we skip these tests on Windows so we do not need to worry about compatibility here
 final String stopWildflyCommand = "${wildflyInstall}/bin/jboss-cli.sh --controller=localhost:${managementPort} --connect command=:shutdown"
 
 repositories {
@@ -88,11 +88,10 @@ task deploy(type: Copy) {
 }
 
 task writeElasticsearchProperties {
-    onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) }
+    onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8 }
     dependsOn 'integTestCluster#wait', deploy
     doLast {
-        final File elasticsearchProperties =
-                file("${wildflyInstall}/standalone/configuration/elasticsearch.properties")
+        final File elasticsearchProperties = file("${wildflyInstall}/standalone/configuration/elasticsearch.properties")
         elasticsearchProperties.write(
                 [
                         "transport.uri=${-> integTest.getNodes().get(0).transportUri()}",
@@ -146,7 +145,7 @@ task startWildfly {
 
 task configureTransportClient(type: LoggedExec) {
     dependsOn startWildfly
-    // we skip these tests on Windows so we do no need to worry about compatibility here
+    // we skip these tests on Windows so we do not need to worry about compatibility here
     commandLine "${wildflyInstall}/bin/jboss-cli.sh",
             "--controller=localhost:${managementPort}",
             "--connect",
@@ -157,7 +156,7 @@ task stopWildfly(type: LoggedExec) {
     commandLine stopWildflyCommand.split(' ')
 }
 
-if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+if (!Os.isFamily(Os.FAMILY_WINDOWS) && project.rootProject.ext.javaVersion == JavaVersion.VERSION_1_8) {
     integTestRunner.dependsOn(configureTransportClient)
     final TaskExecutionAdapter logDumpListener = new TaskExecutionAdapter() {
         @Override