Merge branch 'add-elastic1.6-support'

omershelef · omershelef · commit 6914ee5fc076 · 2015-06-20T22:24:11.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ jdk:
 
 
 before_install:
-  - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.1.deb && sudo dpkg -i --force-confnew elasticsearch-1.4.1.deb
+  - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb && sudo dpkg -i --force-confnew elasticsearch-1.6.0.deb
 
 services:
   - elasticsearch
diff --git a/README.md b/README.md
@@ -15,10 +15,10 @@ You can also use ES functions in SQL.
 
 Install as plugin:
 
-###Elasticsearch 1.4.X
+###Elasticsearch 1.6.X
 ````
 
-./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.3.3/elasticsearch-sql-1.3.3.zip --install sql
+./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.3.4/elasticsearch-sql-1.3.4.zip --install sql
 
 ````
 ## Basic Usage
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>1.3.3</version>
+	<version>1.3.4</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
-			<version>1.4.1</version>
+			<version>1.6.0</version>
 			<scope>provided</scope>
 		</dependency>
 		
diff --git a/src/test/java/org/nlpcn/es4sql/MainTestSuite.java b/src/test/java/org/nlpcn/es4sql/MainTestSuite.java
@@ -109,7 +109,7 @@ public static void loadBulk(String jsonPath) throws Exception {
 
 		BulkRequestBuilder bulkBuilder = new BulkRequestBuilder(client);
 		byte[] buffer = ByteStreams.toByteArray(new FileInputStream(jsonPath));
-		bulkBuilder.add(buffer, 0, buffer.length, true, TEST_INDEX, null);
+		bulkBuilder.add(buffer, 0, buffer.length, TEST_INDEX, null);
 		BulkResponse response = bulkBuilder.get();
 
 		if(response.hasFailures()) {
