Fixup build after opening x-pack

Author: rjernst

settings.gradle

@@ -72,6 +72,7 @@ addSubProjects('', new File(rootProject.projectDir, 'libs'))
 addSubProjects('', new File(rootProject.projectDir, 'modules'))
 addSubProjects('', new File(rootProject.projectDir, 'plugins'))
 addSubProjects('', new File(rootProject.projectDir, 'qa'))
+addSubProjects('', new File(rootProject.projectDir, 'x-pack'))
 
 boolean isEclipse = System.getProperty("eclipse.launcher") != null || gradle.startParameter.taskNames.contains('eclipse') || gradle.startParameter.taskNames.contains('cleanEclipse')
 if (isEclipse) {

x-pack/.ci/java-versions.properties

@@ -3,12 +3,6 @@ import org.elasticsearch.gradle.plugin.PluginBuildPlugin
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.precommit.LicenseHeadersTask
 
-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-elasticsearch')
-}
-
-task wrapper(type: Wrapper)
-
 Project xpackRootProject = project
 
 subprojects {
@@ -78,9 +72,7 @@ subprojects {
   bwcVersions.snapshotProjectNames.each { snapshotName ->
     Version snapshot = bwcVersions.getSnapshotForProject(snapshotName)
     if (snapshot != null && snapshot.onOrAfter("6.3.0")) {
-      String snapshotProject = ":x-pack-elasticsearch:plugin:bwc:${snapshotName}"
+      String snapshotProject = ":x-pack:plugin:bwc:${snapshotName}"
       project(snapshotProject).ext.bwcVersion = snapshot
         ext.projectSubstitutions["org.elasticsearch.plugin:x-pack:${snapshot}"] = snapshotProject
-    }
-  }
 }