Rename x-pack project names to new names with split repo

Original commit: elastic/x-pack-elasticsearch@5a908f5dcc

build.gradle

@@ -1,8 +1,8 @@
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.precommit.LicenseHeadersTask
 
-if (project.projectDir.name != 'x-pack') {
-  throw new GradleException('You must checkout x-pack in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack')
+if (project.projectDir.name != 'x-pack-elasticsearch') {
+  throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack')
 }
 
 subprojects {
@@ -33,7 +33,7 @@ File checkstyleSuppressions = file('dev-tools/checkstyle_suppressions.xml')
 subprojects {
   tasks.withType(Checkstyle) {
     inputs.file(checkstyleSuppressions)
-    // Use x-pack specific suppressions file rather than the open source one.
+    // Use x-pack-elasticsearch specific suppressions file rather than the open source one.
     configProperties = [
       suppressions: checkstyleSuppressions
     ]
@@ -43,5 +43,5 @@ subprojects {
     approvedLicenses = ['Elasticsearch Confidential']
     additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
   }
-  ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-pack:elasticsearch' ]
+  ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-pack-elasticsearch:plugin' ]
 }

buildSrc/settings.gradle

@@ -1,6 +1,6 @@
 File extrasDir = new File(settingsDir, '../..').getCanonicalFile()
 if (extrasDir.name.endsWith('-extra') == false) {
-  throw new GradleException("x-pack must be checked out under an elasticsearch-extra directory, found ${extrasDir.name}")
+  throw new GradleException("x-pack-elasticsearch must be checked out under an elasticsearch-extra directory, found ${extrasDir.name}")
 }
 File elasticsearchDir = new File(extrasDir.parentFile, extrasDir.name[0..-7])
 if (elasticsearchDir.exists() == false) {

license-tools/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'elasticsearch.build'
 
 dependencies {
-  compile project(':x-pack:elasticsearch')
+  compile project(':x-pack-elasticsearch:plugin')
   compile "org.elasticsearch:elasticsearch:${version}"
   testCompile "org.elasticsearch.test:framework:${version}"
 }

plugin/build.gradle

@@ -227,7 +227,7 @@ forbiddenPatterns {
 
 // TODO: standardize packaging config for plugins
 bundlePlugin {
-  from(project(':x-pack').projectDir) {
+  from(parent.projectDir) {
     include 'LICENSE.txt'
   }
   from(projectDir) {

qa/audit-tests/build.gradle

@@ -2,20 +2,20 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 String outputDir = "generated-resources/${project.name}"
 task copyXPackPluginProps(type: Copy) {
-  from project(':x-pack:elasticsearch').file('src/main/plugin-metadata')
-  from project(':x-pack:elasticsearch').tasks.pluginProperties
+  from project(':x-pack-elasticsearch:plugin').file('src/main/plugin-metadata')
+  from project(':x-pack-elasticsearch:plugin').tasks.pluginProperties
   into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.security.audit.enabled', 'true'
     setting 'xpack.security.audit.outputs', 'index'
     setting 'logger.level', 'DEBUG'

qa/core-rest-tests-with-security/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 integTest {
@@ -17,7 +17,7 @@ integTest {
     ].join(',')
 
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.watcher.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setupCommand 'setupDummyUser',

qa/ml-basic-multi-node/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 integTest {
@@ -11,6 +11,6 @@ integTest {
         setting 'xpack.ml.enabled', 'true'
         numNodes = 3
         distribution = 'zip'
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
     }
 }

qa/ml-disabled/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 integTest {
@@ -11,6 +11,6 @@ integTest {
         setting 'xpack.ml.enabled', 'false'
         numNodes = 1
         distribution = 'zip'
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
     }
 }

qa/ml-no-bootstrap-tests/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 

qa/ml-single-node-tests/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
   testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.6'
 }
 
@@ -12,6 +12,6 @@ integTest {
         setting 'xpack.ml.enabled', 'true'
     setting 'script.inline', 'true'
     distribution = 'zip'
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
   }
 }

qa/reindex-tests-with-security/build.gradle

@@ -2,15 +2,15 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'testArtifacts')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts')
   testCompile project(path: ':modules:reindex')
 }
 
 integTest {
   cluster {
     setting 'script.inline', 'true'
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     // Whitelist reindexing from the local node so we can test it.
     setting 'reindex.remote.whitelist', '127.0.0.1:*'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'

qa/rolling-upgrade/build.gradle

@@ -52,7 +52,7 @@ String outputDir = "generated-resources/${project.name}"
 task oldClusterTest(type: RestIntegTestTask) {
     mustRunAfter(precommit)
     cluster {
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
         distribution = 'zip'
         bwcVersion = '5.3.0-SNAPSHOT' // TODO: either randomize, or make this settable with sysprop
         numBwcNodes = 2
@@ -71,7 +71,7 @@ task oldClusterTest(type: RestIntegTestTask) {
 task mixedClusterTest(type: RestIntegTestTask) {
     dependsOn(oldClusterTest, 'oldClusterTest#node1.stop')
     cluster {
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
         distribution = 'zip'
         clusterName = 'rolling-upgrade'
         unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() }
@@ -88,7 +88,7 @@ task mixedClusterTest(type: RestIntegTestTask) {
 task upgradedClusterTest(type: RestIntegTestTask) {
     dependsOn(mixedClusterTest, 'oldClusterTest#node0.stop')
     cluster {
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
         distribution = 'zip'
         clusterName = 'rolling-upgrade'
         unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() }
@@ -112,28 +112,28 @@ test.enabled = false // no unit tests for rolling upgrades, only the rest integr
 check.dependsOn(integTest)
 
 dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 // copy x-pack plugin info so it is on the classpath and security manager has the right permissions
 task copyXPackRestSpec(type: Copy) {
     dependsOn(project.configurations.restSpec, 'processTestResources')
-    from project(':x-pack:elasticsearch').sourceSets.test.resources
+    from project(':x-pack-elasticsearch:plugin').sourceSets.test.resources
     include 'rest-api-spec/api/**'
     into project.sourceSets.test.output.resourcesDir
 }
 
 task copyTestNodeKeystore(type: Copy) {
     dependsOn(copyXPackRestSpec)
-    from project(':x-pack:elasticsearch')
+    from project(':x-pack-elasticsearch:plugin')
             .file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
     into outputDir
 }
 
 task copyXPackPluginProps(type: Copy) {
     dependsOn(copyTestNodeKeystore)
-    from project(':x-pack:elasticsearch').file('src/main/plugin-metadata')
-    from project(':x-pack:elasticsearch').tasks.pluginProperties
+    from project(':x-pack-elasticsearch:plugin').file('src/main/plugin-metadata')
+    from project(':x-pack-elasticsearch:plugin').tasks.pluginProperties
     into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)

qa/security-client-tests/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
-  testCompile project(path: ':x-pack:elasticsearch-transport-client', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:transport-client', configuration: 'runtime')
 }
 
 String outputDir = "generated-resources/${project.name}"
 task copyXPackPluginProps(type: Copy) {
-  from project(':x-pack:elasticsearch').file('src/main/plugin-metadata')
-  from project(':x-pack:elasticsearch').tasks.pluginProperties
+  from project(':x-pack-elasticsearch:plugin').file('src/main/plugin-metadata')
+  from project(':x-pack-elasticsearch:plugin').tasks.pluginProperties
   into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
@@ -17,7 +17,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
 integTest {
   systemProperty 'tests.security.manager', 'false'
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setupCommand 'setupDummyUser',
                  'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
     setupCommand 'setupTransportClientUser',

qa/security-example-realm/build.gradle

@@ -5,10 +5,10 @@ apply plugin: 'elasticsearch.build'
 
 dependencies {
   provided "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
-  provided project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  provided project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 
   testCompile "org.elasticsearch.test:framework:${project.versions.elasticsearch}"
-  testCompile project(path: ':x-pack:elasticsearch-transport-client', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:transport-client', configuration: 'runtime')
 }
 
 Map generateSubstitutions() {
@@ -27,8 +27,8 @@ Map generateSubstitutions() {
 
 String outputDir = "generated-resources/${project.name}"
 task copyXPackPluginProps(type: Copy) {
-  from project(':x-pack:elasticsearch').file('src/main/plugin-metadata')
-  from project(':x-pack:elasticsearch').tasks.pluginProperties
+  from project(':x-pack-elasticsearch:plugin').file('src/main/plugin-metadata')
+  from project(':x-pack-elasticsearch:plugin').tasks.pluginProperties
   into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
@@ -46,7 +46,7 @@ task buildZip(type:Zip, dependsOn: [jar]) {
 task integTest(type: org.elasticsearch.gradle.test.RestIntegTestTask, dependsOn: buildZip) {
   systemProperty 'tests.security.manager', 'false'
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.security.authc.realms.custom.order', '0'
     setting 'xpack.security.authc.realms.custom.type', 'custom'
     setting 'xpack.security.authc.realms.custom.filtered_setting', 'should be filtered'

qa/security-migrate-tests/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
-  testCompile project(path: ':x-pack:elasticsearch-transport-client', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:transport-client', configuration: 'runtime')
 }
 
 integTest {
   cluster {
     setting 'script.inline', 'true'
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     [
       test_admin: 'superuser',

qa/smoke-test-graph-with-security/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 // bring in graph rest test suite
 task copyGraphRestTests(type: Copy) {
   into project.sourceSets.test.output.resourcesDir
-  from project(':x-pack:elasticsearch').sourceSets.test.resources.srcDirs
+  from project(':x-pack-elasticsearch:plugin').sourceSets.test.resources.srcDirs
   include 'rest-api-spec/test/graph/**'
 }
 
@@ -16,7 +16,7 @@ integTest {
   dependsOn copyGraphRestTests
 
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     setupCommand 'setupTestAdminUser',
                  'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'

qa/smoke-test-monitoring-with-security/build.gradle

@@ -3,13 +3,13 @@ subprojects {
   apply plugin: 'elasticsearch.rest-test'
 
   dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
   }
 
   // bring in monitoring rest test suite
   task copyMonitoringRestTests(type: Copy) {
     into project.sourceSets.test.output.resourcesDir
-    from project(':x-pack:elasticsearch').sourceSets.test.resources.srcDirs
+    from project(':x-pack-elasticsearch:plugin').sourceSets.test.resources.srcDirs
     include 'rest-api-spec/test/monitoring/**'
   }
 
@@ -18,7 +18,7 @@ subprojects {
 
     cluster {
       systemProperty 'es.logger.level', 'TRACE'
-      plugin ':x-pack:elasticsearch'
+      plugin ':x-pack-elasticsearch:plugin'
       setting 'xpack.monitoring.collection.interval', '3s'
       extraConfigFile 'x-pack/roles.yml', '../roles.yml'
       setupCommand 'setupTestAdminUser',

qa/smoke-test-plugins-ssl/build.gradle

@@ -14,13 +14,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 String outputDir = "generated-resources/${project.name}"
 task copyXPackPluginProps(type: Copy) {
-  from project(':x-pack:elasticsearch').file('src/main/plugin-metadata')
-  from project(':x-pack:elasticsearch').tasks.pluginProperties
+  from project(':x-pack-elasticsearch:plugin').file('src/main/plugin-metadata')
+  from project(':x-pack-elasticsearch:plugin').tasks.pluginProperties
   into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
@@ -175,7 +175,7 @@ integTest {
     setting 'xpack.security.http.ssl.keystore.path', nodeKeystore.name
     setting 'xpack.security.http.ssl.keystore.password', 'keypass'
 
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
 
     // copy keystores into config/
     extraConfigFile nodeKeystore.name, nodeKeystore

qa/smoke-test-plugins/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 ext.pluginsCount = 1 // we install xpack explicitly
@@ -16,7 +16,7 @@ project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
 
     setupCommand 'setupDummyUser',
                  'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'

qa/smoke-test-security-with-mustache/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
   testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
 }
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.watcher.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setting 'path.scripts', "${project.buildDir}/resources/test/templates"

qa/smoke-test-watcher-with-mustache/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
   testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
 }
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setting 'http.port', '9400'

qa/smoke-test-watcher-with-painless/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
   testCompile project(path: ':modules:lang-painless', configuration: 'runtime')
 }
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'script.inline', 'true'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'

qa/smoke-test-watcher-with-security/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 // bring in watcher rest test suite
 task copyWatcherRestTests(type: Copy) {
   into project.sourceSets.test.output.resourcesDir
-  from project(':x-pack:elasticsearch').sourceSets.test.resources.srcDirs
+  from project(':x-pack-elasticsearch:plugin').sourceSets.test.resources.srcDirs
   include 'rest-api-spec/test/watcher/**'
 }
 
@@ -19,7 +19,7 @@ integTest {
      'getting_started/10_monitor_cluster_health/Getting started - Monitor cluster health'].join(',')
 
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     setupCommand 'setupTestAdminUser',
                  'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'

qa/smoke-test-watcher/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-  testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
+  testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
 }
 
 ext {
@@ -19,7 +19,7 @@ ext {
 
 integTest {
   cluster {
-    plugin ':x-pack:elasticsearch'
+    plugin ':x-pack-elasticsearch:plugin'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setting 'http.port', '9400'

qa/tribe-tests-with-license/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime')
-    testCompile project(path: ':x-pack:elasticsearch', configuration: 'testArtifacts')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'runtime')
+    testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts')
 }
 
 List<NodeInfo> cluster1Nodes
@@ -18,7 +18,7 @@ task setupClusterOne(type: DefaultTask) {
     cluster1Config.clusterName = 'cluster1'
     cluster1Config.setting('node.name', 'cluster1-node1')
     // x-pack
-    cluster1Config.plugin(':x-pack:elasticsearch')
+    cluster1Config.plugin(':x-pack-elasticsearch:plugin')
     cluster1Config.setting('xpack.monitoring.enabled', false)
     cluster1Config.setting('xpack.security.enabled', false)
     cluster1Config.setting('xpack.watcher.enabled', false)
@@ -35,7 +35,7 @@ task setupClusterTwo(type: DefaultTask) {
     cluster2Config.clusterName = 'cluster2'
     cluster2Config.setting('node.name', 'cluster2-node1')
     // x-pack
-    cluster2Config.plugin(':x-pack:elasticsearch')
+    cluster2Config.plugin(':x-pack-elasticsearch:plugin')
     cluster2Config.setting('xpack.monitoring.enabled', false)
     cluster2Config.setting('xpack.monitoring.enabled', false)
     cluster2Config.setting('xpack.security.enabled', false)
@@ -67,7 +67,7 @@ integTest {
         setting 'tribe.cluster2.xpack.watcher.enabled', false
         setting 'tribe.cluster2.xpack.graph.enabled', false
         // x-pack
-        plugin ':x-pack:elasticsearch'
+        plugin ':x-pack-elasticsearch:plugin'
         setting 'xpack.monitoring.enabled', false
         setting 'xpack.monitoring.enabled', false
         setting 'xpack.security.enabled', false

qa/vagrant/build.gradle

@@ -5,7 +5,7 @@ esvagrant {
 }
 
 dependencies {
-    bats project(path: ':x-pack:elasticsearch', configuration: 'zip')
+    bats project(path: ':x-pack-elasticsearch:plugin', configuration: 'zip')
 
     // Inherit Bats test utils from :qa:vagrant project
     bats project(path: ':qa:vagrant', configuration: 'bats')

settings.gradle

@@ -1,6 +1,6 @@
 File extrasDir = new File(settingsDir, '..').getCanonicalFile()
 if (extrasDir.name.endsWith('-extra') == false) {
-  throw new GradleException("x-pack must be checked out under an elasticsearch-extra directory, found ${extrasDir.name}")
+  throw new GradleException("x-pack-elasticsearch must be checked out under an elasticsearch-extra directory, found ${extrasDir.name}")
 }
 File elasticsearchDir = new File(extrasDir.parentFile, extrasDir.name[0..-7])
 project(':').projectDir = elasticsearchDir