es 5.6.8 support

shi-yuan · shi-yuan · commit e113cc6511c8 · 2018-03-03T11:36:05.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_install:
   # update to java 8
   - sudo update-java-alternatives -s java-8-oracle
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.7.deb && sudo dpkg -i --force-confnew elasticsearch-5.6.7.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.8.deb && sudo dpkg -i --force-confnew elasticsearch-5.6.8.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version
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>5.6.7.0</version>
+	<version>5.6.8.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -45,9 +45,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
-		<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
-		<elasticsearch.version>5.6.7</elasticsearch.version>
+		<elasticsearch.version>5.6.8</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 
diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties
@@ -5,10 +5,6 @@ version=${project.version}
 
 name=${elasticsearch.plugin.name}
 
-site=${elasticsearch.plugin.site}
-
-jvm=${elasticsearch.plugin.jvm}
-
 classname=${elasticsearch.plugin.classname}
 
 java.version=1.8
