From 89071f18077d8a0a51d572325ba97db71287103d Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Tue, 1 Aug 2017 10:29:49 -0400
Subject: [PATCH] Remove a dependency cycle in the build
 (elastic/x-pack-elasticsearch#2122)

This is a hack to remove a dependency cycle I added in elastic/x-pack-elasticsearch#2109. I think
it'd be cleaner to remove the cycle by making sql its own plugin that
doesn't depend on the rest of x-pack-elasticsearch but is still
included within x-pack-elasticsearch. But that is a broader change.

Original commit: elastic/x-pack-elasticsearch@47b7d69d809146ea0892e3eff2b88cde3a79af47
---
 sql/jdbc/build.gradle       | 2 --
 sql/net-client/build.gradle | 2 --
 sql/server/build.gradle     | 6 ++++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sql/jdbc/build.gradle b/sql/jdbc/build.gradle
index a761ff4f42b..55dba0a0cb8 100644
--- a/sql/jdbc/build.gradle
+++ b/sql/jdbc/build.gradle
@@ -1,8 +1,6 @@
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.test.RunTask
 
-apply plugin: 'elasticsearch.build'
-
 description = 'JDBC driver for Elasticsearch'
 
 def generatedResources = "$buildDir/generated-resources/main"
diff --git a/sql/net-client/build.gradle b/sql/net-client/build.gradle
index 9faf4299513..d206c959ef3 100644
--- a/sql/net-client/build.gradle
+++ b/sql/net-client/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'elasticsearch.build'
-
 description = 'Common base code for protos'
 
 forbiddenApisMain {
diff --git a/sql/server/build.gradle b/sql/server/build.gradle
index e286dc84860..d4cdb01e809 100644
--- a/sql/server/build.gradle
+++ b/sql/server/build.gradle
@@ -1,7 +1,5 @@
 import org.elasticsearch.gradle.test.RunTask
 
-apply plugin: 'elasticsearch.build'
-
 description = 'The server components of SQL for Elasticsearch'
 
 dependencies {
@@ -31,6 +29,10 @@ compileTestJava.options.compilerArgs << "-parameters"
 // Configure integration tests
 apply plugin: 'elasticsearch.rest-test'
 integTest.mustRunAfter test
+gradle.projectsEvaluated {
+  // Hack to remove a dependency cycle
+  project(':x-pack-elasticsearch:plugin').test.mustRunAfter.getDependencies(project(':x-pack-elasticsearch:plugin').test).remove(test)
+}
 
 integTestCluster {
   distribution = 'zip' // NOCOMMIT make double sure we want all the modules