Merge remote-tracking branch 'elastic/master' into geosql

Author: imotov

build.gradle

@@ -28,6 +28,7 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
 plugins {
     id 'com.gradle.build-scan' version '1.13.2'
+    id 'base'
 }
 if (properties.get("org.elasticsearch.acceptScanTOS", "false") == "true") {
     buildScan {
@@ -37,7 +38,7 @@ if (properties.get("org.elasticsearch.acceptScanTOS", "false") == "true") {
 }
 
 // common maven publishing configuration
-subprojects {
+allprojects {
   group = 'org.elasticsearch'
   version = VersionProperties.elasticsearch
   description = "Elasticsearch subproject ${project.path}"
@@ -185,7 +186,7 @@ task branchConsistency {
   dependsOn verifyVersions, verifyBwcTestsEnabled
 }
 
-subprojects {
+allprojects {
   // ignore missing javadocs
   tasks.withType(Javadoc) { Javadoc javadoc ->
     // the -quiet here is because of a bug in gradle, in that adding a string option
@@ -288,7 +289,7 @@ subprojects {
         if (dep.group == null || false == dep.group.startsWith('org.elasticsearch')) {
           return
         }
-        Project upstreamProject = dependencyToProject(dep)
+        Project upstreamProject = project.ext.dependencyToProject(dep)
         if (upstreamProject == null) {
           return
         }

buildSrc/build.gradle

@@ -89,7 +89,10 @@ compileMinimumRuntimeGroovy {
   sourceCompatibility = minimumRuntimeVersion
 }
 dependencies {
-  compile sourceSets.minimumRuntime.output
+  if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) {
+      // eclipse is confused if this is set explicitly
+    compile sourceSets.minimumRuntime.output
+  }
   minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}"
   minimumRuntimeCompile localGroovy()
 }
@@ -142,7 +145,6 @@ if (project == rootProject) {
     if (System.getProperty("repos.mavenLocal") != null) {
       mavenLocal()
     }
-    mavenCentral()
   }
   test {
     include "**/*Tests.class"
@@ -193,6 +195,7 @@ if (project != rootProject) {
             ).asPath,
     )
     systemProperty 'test.local-test-repo-path', "${rootProject.buildDir}/local-test-repo"
+    systemProperty 'test.version_under_test', version
     systemProperty 'test.lucene-snapshot-revision', (versions.lucene =~ /\w+-snapshot-([a-z0-9]+)/)[0][1]
   }
   check.dependsOn(integTest)
@@ -245,7 +248,7 @@ class VersionPropertiesLoader {
                       elasticsearch
       )
     }
-    String qualifier = systemProperties.getProperty("build.version_qualifier", "alpha1");
+    String qualifier = systemProperties.getProperty("build.version_qualifier", "");
     if (qualifier.isEmpty() == false) {
       if (qualifier.matches("(alpha|beta|rc)\\d+") == false) {
         throw new IllegalStateException("Invalid qualifier: " + qualifier)
@@ -257,4 +260,4 @@ class VersionPropertiesLoader {
     }
     loadedProps.put("elasticsearch", elasticsearch)
   }
-}
+}

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

@@ -66,7 +66,7 @@ class BuildPlugin implements Plugin<Project> {
     void apply(Project project) {
         if (project.pluginManager.hasPlugin('elasticsearch.standalone-rest-test')) {
               throw new InvalidUserDataException('elasticsearch.standalone-test, '
-                + 'elasticearch.standalone-rest-test, and elasticsearch.build '
+                + 'elasticsearch.standalone-rest-test, and elasticsearch.build '
                 + 'are mutually exclusive')
         }
         final String minimumGradleVersion
@@ -442,7 +442,7 @@ class BuildPlugin implements Plugin<Project> {
             // such that we don't have to pass hardcoded files to gradle
             repos.mavenLocal()
         }
-        repos.mavenCentral()
+        repos.jcenter()
         repos.maven {
             name "elastic"
             url "https://artifacts.elastic.co/maven"

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

@@ -343,7 +343,7 @@ class ClusterFormationTasks {
         if (minimumMasterNodes > 0) {
             esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes
         }
-        if (node.config.numNodes > 1) {
+        if (minimumMasterNodes > 1) {
             // don't wait for state.. just start up quickly
             // this will also allow new and old nodes in the BWC case to become the master
             esConfig['discovery.initial_state_timeout'] = '0s'
@@ -719,7 +719,7 @@ class ClusterFormationTasks {
                 unicastHosts.addAll(node.config.otherUnicastHostAddresses.call())
                 String unicastHost = node.config.unicastTransportUri(node, null, project.ant)
                 if (unicastHost != null) {
-                    unicastHosts.addAll(Arrays.asList(unicastHost.split(",")))
+                    unicastHosts.add(unicastHost)
                 }
             }
             String unicastHostsTxt = String.join("\n", unicastHosts)

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -159,8 +159,7 @@ class VagrantTestPlugin implements Plugin<Project> {
     private static void configurePackagingArchiveRepositories(Project project) {
         RepositoryHandler repos = project.repositories
 
-        // Try maven central first, it'll have releases before 5.0.0
-        repos.mavenCentral()
+        repos.jcenter() // will have releases before 5.0.0
 
         /* Setup a repository that tries to download from
           https://artifacts.elastic.co/downloads/elasticsearch/[module]-[revision].[ext]

buildSrc/src/main/java/org/elasticsearch/GradleServicesAdapter.java

@@ -21,6 +21,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.file.CopySpec;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileTree;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.process.ExecResult;
@@ -29,7 +30,7 @@
 import java.io.File;
 
 /**
- * Facilitate access to Gradle services without a direct dependency on Project.
+ * Bridge a gap until Gradle offers service injection for plugins.
  *
  * In a future release Gradle will offer service injection, this adapter plays that role until that time.
  * It exposes the service methods that are part of the public API as the classes implementing them are not.
@@ -65,4 +66,8 @@ public ExecResult javaexec(Action<? super JavaExecSpec> action) {
     public FileTree zipTree(File zipPath) {
         return project.zipTree(zipPath);
     }
+
+    public FileCollection fileTree(File dir) {
+        return project.fileTree(dir);
+    }
 }

buildSrc/src/main/java/org/elasticsearch/gradle/Distribution.java

@@ -20,17 +20,17 @@
 
 public enum Distribution {
 
-    INTEG_TEST("integ-test-zip"),
-    ZIP("zip"),
-    ZIP_OSS("zip-oss");
+    INTEG_TEST("integ-test"),
+    ZIP("elasticsearch"),
+    ZIP_OSS("elasticsearch-oss");
 
-    private final String name;
+    private final String fileName;
 
     Distribution(String name) {
-        this.name = name;
+        this.fileName = name;
     }
 
-    public String getName() {
-        return name;
+    public String getFileName() {
+        return fileName;
     }
 }

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

@@ -20,7 +20,6 @@
 
 import org.elasticsearch.GradleServicesAdapter;
 import org.elasticsearch.gradle.Distribution;
-import org.elasticsearch.gradle.Version;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
@@ -35,7 +34,7 @@ public class ElasticsearchNode {
     private final Logger logger = Logging.getLogger(ElasticsearchNode.class);
 
     private Distribution distribution;
-    private Version version;
+    private String version;
 
     public ElasticsearchNode(String name, GradleServicesAdapter services) {
         this.name = name;
@@ -46,11 +45,11 @@ public String getName() {
         return name;
     }
 
-    public Version getVersion() {
+    public String getVersion() {
         return version;
     }
 
-    public void setVersion(Version version) {
+    public void setVersion(String version) {
         checkFrozen();
         this.version = version;
     }
@@ -75,6 +74,7 @@ void stop(boolean tailLogs) {
     public void freeze() {
         logger.info("Locking configuration of `{}`", this);
         configurationFrozen.set(true);
+        Objects.requireNonNull(version, "Version of test cluster `" + this + "` can't be null");
     }
 
     private void checkFrozen() {

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/SyncTestClustersConfiguration.java

@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.gradle.testclusters;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.File;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class SyncTestClustersConfiguration extends DefaultTask {
+
+    @InputFiles
+    public FileCollection getDependencies() {
+        Set<File> nonZip = getProject().getConfigurations()
+            .getByName(TestClustersPlugin.HELPER_CONFIGURATION_NAME)
+            .getFiles()
+            .stream()
+            .filter(file -> file.getName().endsWith(".zip") == false)
+            .collect(Collectors.toSet());
+        if(nonZip.isEmpty() == false) {
+            throw new IllegalStateException("Expected only zip files in configuration : " +
+                TestClustersPlugin.HELPER_CONFIGURATION_NAME + " but found " +
+                nonZip
+            );
+        }
+        return getProject().files(
+            getProject().getConfigurations()
+                .getByName(TestClustersPlugin.HELPER_CONFIGURATION_NAME)
+                .getFiles()
+        );
+    }
+
+    @OutputDirectory
+    public File getOutputDir() {
+        return getTestClustersConfigurationExtractDir(getProject());
+    }
+
+    @TaskAction
+    public void doExtract() {
+        File outputDir = getOutputDir();
+        getProject().delete(outputDir);
+        outputDir.mkdirs();
+        getDependencies().forEach(dep ->
+            getProject().copy(spec -> {
+                spec.from(getProject().zipTree(dep));
+                spec.into(new File(outputDir, "zip"));
+            })
+        );
+    }
+
+    static File getTestClustersConfigurationExtractDir(Project project) {
+        return new File(TestClustersPlugin.getTestClustersBuildDir(project), "extract");
+    }
+
+}