Fix missing service files in ES-Hadoop jars

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

@@ -645,7 +645,7 @@ class BuildPlugin implements Plugin<Project>  {
     private static String gitHash(File gitHead) {
         String rev = "unknown"
 
-        if (gitHead.exists()) {
+        if (gitHead != null && gitHead.exists()) {
             rev = gitHead.text.trim()
         }
         return rev

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/IntegrationBuildPlugin.groovy

@@ -42,7 +42,8 @@ class IntegrationBuildPlugin implements Plugin<Project> {
             Jar rootJar = project.rootProject.getTasks().getByName('jar') as Jar
             rootJar.dependsOn(project.tasks.jar)
             rootJar.from(project.zipTree(project.tasks.jar.archivePath)) {
-                exclude "META-INF/**"
+                exclude "META-INF/*"
+                include "META-INF/services"
                 include "**/*"
             }
 

hive/build.gradle

@@ -17,6 +17,7 @@ jar {
     from(zipTree(project(":elasticsearch-hadoop-mr").jar.archivePath)) {
         include "org/elasticsearch/hadoop/**"
         include "esh-build.properties"
+        include "META-INF/services/*"
     }
 }
 
@@ -37,4 +38,4 @@ dependencies {
     itestRuntime("org.apache.hive:hive-jdbc:$hiveVersion") {
         exclude module: "log4j-slf4j-impl"
     }
-}
+}

pig/build.gradle

@@ -17,6 +17,7 @@ jar {
     from(zipTree(project(":elasticsearch-hadoop-mr").jar.archivePath)) {
         include "org/elasticsearch/hadoop/**"
         include "esh-build.properties"
+        include "META-INF/services/*"
     }
 }
 
@@ -39,4 +40,4 @@ dependencies {
     testRuntime "jline:jline:0.9.94"
 
     itestRuntime "dk.brics.automaton:automaton:1.11-8"
-}
+}

spark/sql-13/build.gradle

@@ -106,6 +106,7 @@ jar {
     from(zipTree(project(":elasticsearch-hadoop-mr").jar.archivePath)) {
         include "org/elasticsearch/hadoop/**"
         include "esh-build.properties"
+        include "META-INF/services/*"
     }
 }
 
@@ -135,4 +136,4 @@ configurations.all { Configuration conf ->
     }
 
     conf.exclude group: "org.mortbay.jetty"
-}
+}

spark/sql-20/build.gradle

@@ -119,6 +119,7 @@ jar {
     from(zipTree(project(":elasticsearch-hadoop-mr").jar.archivePath)) {
         include "org/elasticsearch/hadoop/**"
         include "esh-build.properties"
+        include "META-INF/services/*"
     }
 }
 

storm/build.gradle

@@ -17,6 +17,7 @@ jar {
     from(zipTree(project(":elasticsearch-hadoop-mr").jar.archivePath)) {
         include "org/elasticsearch/hadoop/**"
         include "esh-build.properties"
+        include "META-INF/services/*"
     }
 }
 
@@ -41,4 +42,4 @@ dependencies {
 // add itest to Eclipse
 //eclipse.classpath.plusConfigurations += [configurations.itestCompile]
 
-tasks.getByName('integrationTest').enabled = false
+tasks.getByName('integrationTest').enabled = false