From 0ab1accb005f1a74a952aa90a3880d9b28b49e53 Mon Sep 17 00:00:00 2001
From: Costin Leau <costin.leau@gmail.com>
Date: Fri, 6 Jul 2018 16:08:14 +0300
Subject: [PATCH] QA: build improvements related to SQL projects

Register SQL as an xpackModule
Specify group for SQL QA to disambiguate projects (otherwise due to an
old Gradle bug (https://github.com/gradle/gradle/issues/847) any
subprojects under SQL QA will not be able to refer to SQL xpackModule

Co-authored-by: Alpar Torok <torokalpar@gmail.com>
---
 x-pack/build.gradle        | 1 +
 x-pack/qa/sql/build.gradle | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x-pack/build.gradle b/x-pack/build.gradle
index 6a064ff5b7c64..ca06b0763ed26 100644
--- a/x-pack/build.gradle
+++ b/x-pack/build.gradle
@@ -45,6 +45,7 @@ subprojects {
   ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-ml:${version}": xpackModule('ml')]
   ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-monitoring:${version}": xpackModule('monitoring')]
   ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-security:${version}": xpackModule('security')]
+  ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-sql:${version}": xpackModule('sql')]
   ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-upgrade:${version}": xpackModule('upgrade')]
   ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-watcher:${version}": xpackModule('watcher')]
 }
diff --git a/x-pack/qa/sql/build.gradle b/x-pack/qa/sql/build.gradle
index a56325dff2c35..17a1d5acdc99f 100644
--- a/x-pack/qa/sql/build.gradle
+++ b/x-pack/qa/sql/build.gradle
@@ -4,6 +4,7 @@ import org.elasticsearch.gradle.test.RunTask
 description = 'Integration tests for SQL'
 apply plugin: 'elasticsearch.build'
 archivesBaseName = 'qa-sql'
+group = "org.elasticsearch.x-pack.qa.sql"
 
 dependencies {
   compile "org.elasticsearch.test:framework:${version}"