elastic · jbaiera · Oct 25, 2019 · Oct 18, 2019 · Oct 24, 2019 · dakrone
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy
@@ -160,24 +160,21 @@ class BuildPlugin implements Plugin<Project>  {
             println "Using Gradle [${project.gradle.gradleVersion}]"
 
             // Hadoop versions
-            project.rootProject.ext.hadoopClient = []
-            project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopStable"
-
+            project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopYarn"
             switch (project.rootProject.ext.hadoopDistro) {
                 // Hadoop YARN/2.0.x
                 case "hadoopYarn":
-                    String version = project.hadoop2Version
-                    project.rootProject.ext.hadoopVersion = version
-                    project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
-                    println "Using Apache Hadoop on YARN [$version]"
+                    project.rootProject.ext.hadoopVersion = project.hadoop2Version
+                    println "Using Apache Hadoop on YARN [$project.hadoop2Version]"
+                    break
+                case "hadoopStable":
+                    project.rootProject.ext.hadoopVersion = project.hadoop22Version
+                    println "Using Apache Hadoop [$project.hadoop22Version]"
                     break
-
                 default:
-                    String version = project.hadoop22Version
-                    project.rootProject.ext.hadoopVersion = version
-                    project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
-                    println "Using Apache Hadoop [$version]"
+                    throw new GradleException("Invalid [hadoopDistro] setting: [$project.rootProject.ext.hadoopDistro]")
             }
+            project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$project.rootProject.ext.hadoopVersion"]
         }
         project.ext.eshadoopVersion = project.rootProject.ext.eshadoopVersion
         project.ext.elasticsearchVersion = project.rootProject.ext.elasticsearchVersion

diff --git a/licenses/hadoop-client-2.2.0.jar.sha1 b/licenses/hadoop-client-2.2.0.jar.sha1
diff --git a/licenses/hadoop-client-2.7.6.jar.sha1 b/licenses/hadoop-client-2.7.6.jar.sha1
@@ -0,0 +1 @@
+1e81abd78494a0f41f36178152c20e2deb3e9e8d
diff --git a/licenses/hadoop-common-2.2.0.jar.sha1 b/licenses/hadoop-common-2.2.0.jar.sha1
diff --git a/licenses/hadoop-common-2.7.6.jar.sha1 b/licenses/hadoop-common-2.7.6.jar.sha1
@@ -0,0 +1 @@
+b3af0a73d6d3226cd46d4d29c6272a046b90a9f1
diff --git a/licenses/hadoop-mapreduce-client-core-2.2.0.jar.sha1 b/licenses/hadoop-mapreduce-client-core-2.2.0.jar.sha1
diff --git a/licenses/hadoop-mapreduce-client-core-2.7.6.jar.sha1 b/licenses/hadoop-mapreduce-client-core-2.7.6.jar.sha1
@@ -0,0 +1 @@
+fb3b92f837656dbbd2ad5d96f02f09af67c59a17
diff --git a/mr/licenses/hadoop-client-2.2.0.jar.sha1 b/mr/licenses/hadoop-client-2.2.0.jar.sha1
diff --git a/mr/licenses/hadoop-client-2.7.6.jar.sha1 b/mr/licenses/hadoop-client-2.7.6.jar.sha1
@@ -0,0 +1 @@
+1e81abd78494a0f41f36178152c20e2deb3e9e8d
diff --git a/mr/licenses/hadoop-common-2.2.0.jar.sha1 b/mr/licenses/hadoop-common-2.2.0.jar.sha1
diff --git a/mr/licenses/hadoop-common-2.7.6.jar.sha1 b/mr/licenses/hadoop-common-2.7.6.jar.sha1
@@ -0,0 +1 @@
+b3af0a73d6d3226cd46d4d29c6272a046b90a9f1
diff --git a/mr/licenses/hadoop-mapreduce-client-core-2.2.0.jar.sha1 b/mr/licenses/hadoop-mapreduce-client-core-2.2.0.jar.sha1
diff --git a/mr/licenses/hadoop-mapreduce-client-core-2.7.6.jar.sha1 b/mr/licenses/hadoop-mapreduce-client-core-2.7.6.jar.sha1
@@ -0,0 +1 @@
+fb3b92f837656dbbd2ad5d96f02f09af67c59a17