From be32241263ecfd62515cda447c81a25c970de282 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Fri, 8 Sep 2017 09:43:18 -0400
Subject: [PATCH] SQL: Trivial gradle files cleanups
 (elastic/x-pack-elasticsearch#2447)

Resolved a few NOCOMMITS in Gradle files plus some minor cleanups

Original commit: elastic/x-pack-elasticsearch@b422d693b02d282fc18a0e163f84c6a71a64b243
---
 sql/build.gradle        |  3 ---
 sql/cli/build.gradle    |  6 ++++--
 sql/jdbc/build.gradle   | 11 +++++------
 sql/server/build.gradle |  3 ---
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/sql/build.gradle b/sql/build.gradle
index 333689d889f..abeafb08dfc 100644
--- a/sql/build.gradle
+++ b/sql/build.gradle
@@ -3,9 +3,6 @@ description = 'SQL for Elasticsearch'
 subprojects {
   apply plugin: 'elasticsearch.build'
 
-  // NOCOMMIT this is abnormal enough it is worth removing
-  sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
-
   dependencies {
     testCompile "org.elasticsearch.test:framework:${version}"
   }
diff --git a/sql/cli/build.gradle b/sql/cli/build.gradle
index b9d518ca46c..07c66944d57 100644
--- a/sql/cli/build.gradle
+++ b/sql/cli/build.gradle
@@ -14,7 +14,9 @@ dependencies {
 
   // Used by embedded sql instance
   testCompile project(":x-pack-elasticsearch:transport-client")
-  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts') // NOCOMMIT remove this?
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts') // NOCOMMIT this is needed for TestUtils
+                                                                                            // we can remove this when #2432 is in
+  testCompile project(':x-pack-elasticsearch:sql:server')
   testCompile project(':x-pack-elasticsearch:sql:test-utils')
 
   runtime "org.fusesource.jansi:jansi:1.16"
@@ -88,7 +90,7 @@ apply plugin: 'elasticsearch.rest-test'
 integTest.mustRunAfter test
 
 integTestCluster {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  distribution = 'zip' // we need this for painless support
   plugin project(':x-pack-elasticsearch:plugin').path
   /* Get a "clean" test without the other x-pack features here and check them
    * all together later on. */
diff --git a/sql/jdbc/build.gradle b/sql/jdbc/build.gradle
index 7336783c0d1..d68c14d94fd 100644
--- a/sql/jdbc/build.gradle
+++ b/sql/jdbc/build.gradle
@@ -1,10 +1,7 @@
-import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.test.RunTask
 
 description = 'JDBC driver for Elasticsearch'
 
-def generatedResources = "$buildDir/generated-resources/main"
-
 forbiddenApisMain {
   // does not depend on core, so only jdk and http signatures should be checked
   signaturesURLs = [this.class.getResource('/forbidden/jdk-signatures.txt')]
@@ -19,7 +16,9 @@ dependencies {
 
   // Used by the embedded sql tests
   testCompile project(path: ':client:transport', configuration: 'runtime')
-  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts') // NOCOMMIT remove me?
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts') // NOCOMMIT this is needed for TestUtils
+                                                                                            // we can remove this when #2432 is in
+  testCompile project(':x-pack-elasticsearch:sql:server')
   testCompile project(':x-pack-elasticsearch:sql:test-utils')
   testCompile "net.sourceforge.csvjdbc:csvjdbc:1.0.31"
 
@@ -47,7 +46,7 @@ apply plugin: 'elasticsearch.rest-test'
 integTest.mustRunAfter test
 
 integTestCluster {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  distribution = 'zip' // we need this for painless support
   plugin project(':x-pack-elasticsearch:plugin').path
   /* Get a "clean" test without the other x-pack features here and check them
    * all together later on. */
@@ -59,7 +58,7 @@ integTestCluster {
 }
 
 task run(type: RunTask) {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  distribution = 'zip' // we want to run it with painless
   plugin project(':x-pack-elasticsearch:plugin').path
   /* Get a "clean" test without the other x-pack features here and check them
    * all together later on. */
diff --git a/sql/server/build.gradle b/sql/server/build.gradle
index 1e660e8eabf..c2a36426439 100644
--- a/sql/server/build.gradle
+++ b/sql/server/build.gradle
@@ -1,5 +1,3 @@
-import org.elasticsearch.gradle.test.RunTask
-
 description = 'The server components of SQL for Elasticsearch'
 
 dependencies {
@@ -7,7 +5,6 @@ dependencies {
   compile project(':x-pack-elasticsearch:sql:cli-proto')
   compile project(':x-pack-elasticsearch:sql:shared-proto')
   provided "org.elasticsearch.plugin:aggs-matrix-stats-client:${project.versions.elasticsearch}"
-  //NOCOMMIT - we should upgrade to the latest 4.5.x if not 4.7
   compile 'org.antlr:antlr4-runtime:4.5.1-1'
   provided "org.elasticsearch:elasticsearch:${project.versions.elasticsearch}"