Upgrading ES to 5.0.0-rc1

Author: jbaiera

build.gradle

@@ -22,7 +22,7 @@ allprojects {
       // Hive depends on JDO ec2 missing from Maven Central
       maven { url "http://www.datanucleus.org/downloads/maven2" }
       maven { url "http://oss.sonatype.org/content/groups/public/" }
-      maven { url "https://staging.elastic.co/5.0.0-beta1-5eb5cbdb/maven" }
+      maven { url "https://staging.elastic.co/5.0.0-rc1-9db751df/maven" }
     }
 
     apply plugin: "java"

gradle.properties

@@ -35,8 +35,8 @@ hamcrestVersion = 1.3
 # Hive 0.11 finally updated antlr to 3.4 so there are no more conflicts with Pig
 antlrVersion = 3.4
 thriftVersion = 0.5.0
-esVersion = 5.0.0-beta1
-esVersionStable = 5.0.0-beta1
+esVersion = 5.0.0-rc1
+esVersionStable = 5.0.0-rc1
 
 luceneVersion = 6.0.0
 groovyVersion = 2.4.4

mr/src/main/java/org/elasticsearch/hadoop/rest/RestRepository.java

@@ -419,7 +419,11 @@ public void delete() {
         }
         else {
             // try first a blind delete by query (since the plugin might be installed)
-            client.delete(resourceW.indexAndType() + "/_query?q=*");
+            try {
+                client.delete(resourceW.indexAndType() + "/_query?q=*");
+            } catch (EsHadoopInvalidRequest ehir) {
+                log.info("Skipping delete by query as the plugin is not installed...");
+            }
 
             // in ES 2.0 and higher this means scrolling and deleting the docs by hand...
             // do a scroll-scan without source

mr/src/main/java/org/elasticsearch/hadoop/rest/SearchRequestBuilder.java

@@ -192,7 +192,7 @@ private String assemble() {
         }
         if (local) {
             if (pref.length() > 0) {
-                pref.append(";");
+                pref.append("|");
             }
             pref.append("_local");
         }