QA: build improvements related to SQL projects (#31862)

costin · alpar-t · web-flow · commit 6f5d8caeb7db · 2018-07-06T18:24:12.000+03:00
Register SQL as an xpackModule Specify group for SQL QA to disambiguate projects (otherwise due to an old Gradle bug (gradle/gradle#847) any subprojects under SQL QA will not be able to refer to SQL xpackModule Co-authored-by: Alpar Torok <torokalpar@gmail.com>
diff --git 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
@@ -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}"

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ subprojects {`
`45`	`45`	`ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-ml:${version}": xpackModule('ml')]`
`46`	`46`	`ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-monitoring:${version}": xpackModule('monitoring')]`
`47`	`47`	`ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-security:${version}": xpackModule('security')]`
	`48`	`+ ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-sql:${version}": xpackModule('sql')]`
`48`	`49`	`ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-upgrade:${version}": xpackModule('upgrade')]`
`49`	`50`	`ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-watcher:${version}": xpackModule('watcher')]`
`50`	`51`	`}`