Merge branch 'master' into docker-compose-fixture-for-gcs

Author: tlrx

README.textile

@@ -124,7 +124,7 @@ curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -H 'Content-Type:
 
 There are many more options to perform search, after all, it's a search product no? All the familiar Lucene queries are available through the JSON query language, or through the query parser.
 
-h3. Multi Tenant - Indices and Types
+h3. Multi Tenant and Indices
 
 Man, that twitter index might get big (in this case, index size == valuation). Let's see if we can structure our twitter system a bit differently in order to support such large amounts of data.
 

benchmarks/build.gradle

@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.info.BuildParams
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -44,7 +46,7 @@ compileJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked,-processi
 // needs to be added separately otherwise Gradle will quote it and javac will fail
 compileJava.options.compilerArgs.addAll(["-processor", "org.openjdk.jmh.generators.BenchmarkProcessor"])
 
-run.executable = new File(project.runtimeJavaHome, 'bin/java')
+run.executable = "${BuildParams.runtimeJavaHome}/bin/java"
 
 // classes generated by JMH can use all sorts of forbidden APIs but we have no influence at all and cannot exclude these classes
 forbiddenApisMain.enabled = false

buildSrc/build.gradle

@@ -217,8 +217,8 @@ if (project != rootProject) {
   task integTest(type: Test) {
     inputs.dir(file("src/testKit")).withPropertyName("testkit dir").withPathSensitivity(PathSensitivity.RELATIVE)
     systemProperty 'test.version_under_test', version
-    onlyIf { project.inFipsJvm == false }
-    maxParallelForks = System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel.toString()) as Integer
+    onlyIf { org.elasticsearch.gradle.info.BuildParams.inFipsJvm == false }
+    maxParallelForks = System.getProperty('tests.jvms', org.elasticsearch.gradle.info.BuildParams.defaultParallel.toString()) as Integer
   }
   check.dependsOn(integTest)
 

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -23,10 +23,10 @@ import org.elasticsearch.gradle.BuildPlugin
 import org.elasticsearch.gradle.NoticeTask
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
+import org.elasticsearch.gradle.info.BuildParams
 import org.elasticsearch.gradle.test.RestIntegTestTask
 import org.elasticsearch.gradle.testclusters.RunTask
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin
-import org.elasticsearch.gradle.tool.ClasspathUtils
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -146,7 +146,7 @@ class PluginBuildPlugin implements Plugin<Project> {
 
     private static void configureDependencies(Project project) {
         project.dependencies {
-            if (ClasspathUtils.isElasticsearchProject(project)) {
+            if (BuildParams.internal) {
                 compileOnly project.project(':server')
                 testCompile project.project(':test:framework')
             } else {

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy

@@ -23,7 +23,7 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin
 import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask
 import org.elasticsearch.gradle.VersionProperties
-import org.elasticsearch.gradle.tool.ClasspathUtils
+import org.elasticsearch.gradle.info.BuildParams
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.plugins.JavaBasePlugin
@@ -46,7 +46,7 @@ class PrecommitTasks {
         }
 
         Configuration jarHellConfig = project.configurations.create("jarHell")
-        if (ClasspathUtils.isElasticsearchProject(project) && project.path.equals(":libs:elasticsearch-core") == false) {
+        if (BuildParams.internal && project.path.equals(":libs:elasticsearch-core") == false) {
             // External plugins will depend on this already via transitive dependencies.
             // Internal projects are not all plugins, so make sure the check is available
             // we are not doing this for this project itself to avoid jar hell with itself
@@ -132,8 +132,8 @@ class PrecommitTasks {
         return project.tasks.register('thirdPartyAudit', ThirdPartyAuditTask) { task ->
             task.dependsOn(buildResources)
             task.signatureFile = buildResources.copy("forbidden/third-party-audit.txt")
-            task.javaHome = project.runtimeJavaHome
-            task.targetCompatibility.set(project.provider({ project.runtimeJavaVersion }))
+            task.javaHome = BuildParams.runtimeJavaHome
+            task.targetCompatibility.set(project.provider({ BuildParams.runtimeJavaVersion }))
         }
     }
 
@@ -144,13 +144,13 @@ class PrecommitTasks {
             dependsOn(buildResources)
             doFirst {
                 // we need to defer this configuration since we don't know the runtime java version until execution time
-                targetCompatibility = project.runtimeJavaVersion.getMajorVersion()
+                targetCompatibility = BuildParams.runtimeJavaVersion.majorVersion
                 /*
                 TODO: Reenable once Gradle supports Java 13 or later!
-                if (project.runtimeJavaVersion > JavaVersion.VERSION_13) {
+                if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_13) {
                     project.logger.info(
                             "Forbidden APIs does not support java version past 13. Will use the signatures from 13 for ",
-                            project.runtimeJavaVersion
+                            BuildParams.runtimeJavaVersion`
                     )
                     targetCompatibility = JavaVersion.VERSION_13.getMajorVersion()
                 }
@@ -251,7 +251,7 @@ class PrecommitTasks {
     }
 
     private static TaskProvider configureLoggerUsage(Project project) {
-        Object dependency = ClasspathUtils.isElasticsearchProject(project) ? project.project(':test:logger-usage') :
+        Object dependency = BuildParams.internal ? project.project(':test:logger-usage') :
                 "org.elasticsearch.test:logger-usage:${VersionProperties.elasticsearch}"
 
         project.configurations.create('loggerUsagePlugin')

buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy

@@ -30,6 +30,7 @@
 import org.elasticsearch.gradle.JdkDownloadPlugin;
 import org.elasticsearch.gradle.Version;
 import org.elasticsearch.gradle.VersionProperties;
+import org.elasticsearch.gradle.info.BuildParams;
 import org.elasticsearch.gradle.vagrant.BatsProgressLogger;
 import org.elasticsearch.gradle.vagrant.VagrantBasePlugin;
 import org.elasticsearch.gradle.vagrant.VagrantExtension;
@@ -165,8 +166,7 @@ private static Version getUpgradeVersion(Project project) {
             return Version.fromString(project.getVersion().toString());
         }
 
-        ExtraPropertiesExtension rootExtraProperties = project.getRootProject().getExtensions().getByType(ExtraPropertiesExtension.class);
-        String firstPartOfSeed = rootExtraProperties.get("testSeed").toString().split(":")[0];
+        String firstPartOfSeed = BuildParams.getTestSeed().split(":")[0];
         final long seed = Long.parseUnsignedLong(firstPartOfSeed, 16);
         BwcVersions bwcVersions = (BwcVersions) extraProperties.get("bwcVersions");
         final List<Version> indexCompatVersions = bwcVersions.getIndexCompatible();

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java

@@ -19,10 +19,10 @@
 package org.elasticsearch.gradle.test
 
 import org.elasticsearch.gradle.VersionProperties
+import org.elasticsearch.gradle.info.BuildParams
 import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
 import org.elasticsearch.gradle.testclusters.RestTestRunnerTask
 import org.elasticsearch.gradle.tool.Boilerplate
-import org.elasticsearch.gradle.tool.ClasspathUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.Task
 import org.gradle.api.file.FileCopyDetails
@@ -47,7 +47,7 @@ class RestIntegTestTask extends DefaultTask {
 
         project.testClusters {
                 "$name" {
-                    javaHome = project.file(project.ext.runtimeJavaHome)
+                    javaHome = BuildParams.runtimeJavaHome
                 }
         }
         runner.useCluster project.testClusters."$name"
@@ -123,7 +123,7 @@ class RestIntegTestTask extends DefaultTask {
         Boilerplate.maybeCreate(project.configurations, 'restSpec') {
             project.dependencies.add(
                     'restSpec',
-                    ClasspathUtils.isElasticsearchProject(project) ? project.project(':rest-api-spec') :
+                    BuildParams.internal ? project.project(':rest-api-spec') :
                             "org.elasticsearch:rest-api-spec:${VersionProperties.elasticsearch}"
             )
         }

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy

@@ -23,6 +23,7 @@ package org.elasticsearch.gradle.test
 import groovy.transform.CompileStatic
 import org.elasticsearch.gradle.BuildPlugin
 import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask
+import org.elasticsearch.gradle.info.BuildParams
 import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin
 import org.elasticsearch.gradle.precommit.PrecommitTasks
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin
@@ -67,8 +68,8 @@ class StandaloneRestTestPlugin implements Plugin<Project> {
         BuildPlugin.configureFips140(project)
 
         ExtraPropertiesExtension ext = project.extensions.getByType(ExtraPropertiesExtension)
-        project.extensions.getByType(JavaPluginExtension).sourceCompatibility = ext.get('minimumRuntimeVersion') as JavaVersion
-        project.extensions.getByType(JavaPluginExtension).targetCompatibility = ext.get('minimumRuntimeVersion') as JavaVersion
+        project.extensions.getByType(JavaPluginExtension).sourceCompatibility = BuildParams.minimumRuntimeVersion
+        project.extensions.getByType(JavaPluginExtension).targetCompatibility = BuildParams.minimumRuntimeVersion
 
         // only setup tests to build
         SourceSetContainer sourceSets = project.extensions.getByType(SourceSetContainer)

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/StandaloneRestTestPlugin.groovy

@@ -22,7 +22,7 @@
 import org.elasticsearch.gradle.ElasticsearchDistribution.Flavor;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
-import org.elasticsearch.gradle.tool.ClasspathUtils;
+import org.elasticsearch.gradle.info.BuildParams;
 import org.gradle.api.GradleException;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Plugin;
@@ -75,7 +75,7 @@ public void apply(Project project) {
 
         setupDownloadServiceRepo(project);
 
-        if (ClasspathUtils.isElasticsearchProject(project)) {
+        if (BuildParams.isInternal()) {
             ExtraPropertiesExtension extraProperties = project.getExtensions().getExtraProperties();
             this.bwcVersions = (BwcVersions) extraProperties.get("bwcVersions");
         }
@@ -179,7 +179,7 @@ private static void setupDownloadServiceRepo(Project project) {
             return;
         }
         addIvyRepo(project, DOWNLOAD_REPO_NAME, "https://artifacts.elastic.co", FAKE_IVY_GROUP);
-        if (ClasspathUtils.isElasticsearchProject(project) == false) {
+        if (BuildParams.isInternal() == false) {
             // external, so add snapshot repo as well
             addIvyRepo(project, SNAPSHOT_REPO_NAME, "https://snapshots.elastic.co", FAKE_SNAPSHOT_IVY_GROUP);
         }
@@ -198,7 +198,7 @@ private static void setupDownloadServiceRepo(Project project) {
      */
     private Object dependencyNotation(Project project, ElasticsearchDistribution distribution) {
 
-        if (ClasspathUtils.isElasticsearchProject(project)) {
+        if (BuildParams.isInternal()) {
             // non-external project, so depend on local build
 
             if (VersionProperties.getElasticsearch().equals(distribution.getVersion())) {