support es 2.3.2 for NLPchina#206

ansjsun · ansjsun · commit 59aef9536797 · 2016-05-03T14:03:35.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 
 
 script:
-  - wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb
+  - wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.2/elasticsearch-2.3.2.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.2.deb
   - sudo /usr/share/elasticsearch/bin/plugin install delete-by-query
   - sudo service elasticsearch start
   - sleep 10
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>2.3.0.0</version>
+    <version>2.3.2.0</version>
     <packaging>jar</packaging>
     <description>Query elasticsearch using SQL</description>
     <name>elasticsearch-sql</name>
@@ -34,30 +34,14 @@
         </developer>
     </developers>
 
-    <distributionManagement>
-        <repository>
-            <id>mvn-repo</id>
-            <url>scpexe://ansj/home/mvn-repo/ROOT</url>
-        </repository>
-    </distributionManagement>
-
-
-    <repositories>
-        <repository>
-            <id>mvn-repo</id>
-            <url>http://maven.nlpcn.org/</url>
-        </repository>
-    </repositories>
-
-
 
     <properties>
         <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>2.3.0</elasticsearch.version>
+        <elasticsearch.version>2.3.2</elasticsearch.version>
         <elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 
     </properties>
@@ -245,15 +229,6 @@
             </plugin>
         </plugins>
 
-
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-                <version>1.0-beta-6</version>
-            </extension>
-        </extensions>
-
     </build>
 
 </project>
diff --git a/src/test/java/org/nlpcn/es4sql/MainTestSuite.java b/src/test/java/org/nlpcn/es4sql/MainTestSuite.java
@@ -2,38 +2,35 @@
 
 
 
-import com.google.common.io.ByteStreams;
-import org.apache.lucene.index.IndexNotFoundException;
+import static org.nlpcn.es4sql.TestsConstants.TEST_INDEX;
+
+import java.io.FileInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.deletebyquery.DeleteByQueryAction;
 import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder;
 import org.elasticsearch.client.transport.TransportClient;
-
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.index.query.QueryBuilders;
-
 import org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import java.io.FileInputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import static org.nlpcn.es4sql.TestsConstants.*;
+import com.google.common.io.ByteStreams;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 		QueryTest.class,
 		MethodQueryTest.class,
 		AggregationTest.class,
         JoinTests.class,
-//		DeleteTest.class,
+		DeleteTest.class,
 		ExplainTest.class,
         WktToGeoJsonConverterTests.class,
         SqlParserTests.class,
