Merge branch 'master' into shortCut-Exists-Query-37475

Author: Christoph Büscher

build.gradle

@@ -241,7 +241,7 @@ allprojects {
     "org.elasticsearch.plugin:rank-eval-client:${version}": ':modules:rank-eval',
     // for security example plugins
     "org.elasticsearch.plugin:x-pack-core:${version}": ':x-pack:plugin:core',
-    "org.elasticsearch.client.x-pack-transport:${version}": ':x-pack:transport-client'
+    "org.elasticsearch.client:x-pack-transport:${version}": ':x-pack:transport-client'
   ]
 
   /*

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

@@ -224,7 +224,7 @@ class ClusterFormationTasks {
                 classifier = "" // for bwc, before we had classifiers
             }
             // group does not matter as it is not used when we pull from the ivy repo that points to the download service
-            dependency = "dnm:${artifactName}:${elasticsearchVersion}${classifier}@${packaging}"
+            dependency = "dnm:${artifactName}:${elasticsearchVersion}-${classifier}@${packaging}"
         }
         project.dependencies.add(configuration.name, dependency)
     }

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

@@ -18,13 +18,15 @@
  */
 package org.elasticsearch;
 
+import org.elasticsearch.gradle.LoggedExec;
 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;
+import org.gradle.process.ExecSpec;
 import org.gradle.process.JavaExecSpec;
 
 import java.io.File;
@@ -70,4 +72,8 @@ public FileTree zipTree(File zipPath) {
     public FileCollection fileTree(File dir) {
         return project.fileTree(dir);
     }
+
+    public void loggedExec(Action<ExecSpec> action) {
+        LoggedExec.exec(project, action);
+    }
 }

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

@@ -20,23 +20,36 @@
 
 public enum Distribution {
 
-    INTEG_TEST("integ-test", "zip"),
-    ZIP("elasticsearch", "zip"),
-    ZIP_OSS("elasticsearch-oss", "zip");
+    INTEG_TEST("integ-test"),
+    DEFAULT("elasticsearch"),
+    OSS("elasticsearch-oss");
 
     private final String fileName;
-    private final String fileExtension;
 
-    Distribution(String name, String fileExtension) {
+    Distribution(String name) {
         this.fileName = name;
-        this.fileExtension = fileExtension;
     }
 
-    public String getFileName() {
+    public String getArtifactName() {
         return fileName;
     }
 
     public String getFileExtension() {
-        return fileExtension;
+        if (this.equals(INTEG_TEST)) {
+            return "zip";
+        } else {
+            return OS.conditionalString()
+                .onUnix(() -> "tar.gz")
+                .onWindows(() -> "zip")
+                .supply();
+        }
+    }
+
+    public String getClassifier() {
+        return OS.<String>conditional()
+            .onLinux(() -> "linux-x86_64")
+            .onWindows(() -> "windows-x86_64")
+            .onMac(() -> "darwin-x86_64")
+            .supply();
     }
 }

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

@@ -0,0 +1,90 @@
+/*
+ * 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;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public enum OS {
+    WINDOWS,
+    MAC,
+    LINUX;
+
+    public static OS current() {
+        String os = System.getProperty("os.name", "");
+        if (os.startsWith("Windows")) {
+            return OS.WINDOWS;
+        }
+        if (os.startsWith("Linux") || os.startsWith("LINUX")) {
+            return OS.LINUX;
+        }
+        if (os.startsWith("Mac")) {
+            return OS.MAC;
+        }
+        throw new IllegalStateException("Can't determine OS from: " + os);
+    }
+
+    public static class Conditional<T> {
+
+        private final Map<OS, Supplier<T>> conditions = new HashMap<>();
+
+        public Conditional<T> onWindows(Supplier<T> supplier) {
+            conditions.put(WINDOWS, supplier);
+            return this;
+        }
+
+        public Conditional<T> onLinux(Supplier<T> supplier) {
+            conditions.put(LINUX, supplier);
+            return this;
+        }
+
+        public Conditional<T> onMac(Supplier<T> supplier) {
+            conditions.put(MAC, supplier);
+            return this;
+        }
+
+        public Conditional<T> onUnix(Supplier<T> supplier) {
+            conditions.put(MAC, supplier);
+            conditions.put(LINUX, supplier);
+            return this;
+        }
+
+        public T supply() {
+            HashSet<OS> missingOS = new HashSet<>(Arrays.asList(OS.values()));
+            missingOS.removeAll(conditions.keySet());
+            if (missingOS.isEmpty() == false) {
+                throw new IllegalArgumentException("No condition specified for " + missingOS);
+            }
+            return conditions.get(OS.current()).get();
+        }
+
+    }
+
+    public static <T> Conditional<T> conditional() {
+        return new Conditional<>();
+    }
+
+    public static Conditional<String> conditionalString() {
+        return conditional();
+    }
+
+}