Merge branch 'master' of github.com:medcl/elasticsearch-analysis-ik

infinilabs · Aug 15, 2016 · efb393f · efb393f
2 parents 2df086b + b11aec3
commit efb393f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@ Versions
 
 IK version | ES version
 -----------|-----------
-master | 2.3.4 -> master
+master | 2.3.5 -> master
+1.9.5 | 2.3.5
 1.9.4 | 2.3.4
 1.9.3 | 2.3.3
 1.9.0 | 2.3.0

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-ik</artifactId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
     <packaging>jar</packaging>
     <description>IK Analyzer for Elasticsearch</description>
     <inceptionYear>2011</inceptionYear>
 
     <properties>
-        <elasticsearch.version>2.3.4</elasticsearch.version>
+        <elasticsearch.version>2.3.5</elasticsearch.version>
         <maven.compiler.target>1.7</maven.compiler.target>
         <elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
         <elasticsearch.plugin.name>analysis-ik</elasticsearch.plugin.name>
@@ -54,7 +54,7 @@
         <version>7</version>
     </parent>
 
-  <repositories>
+    <repositories>
         <repository>
             <id>oss.sonatype.org</id>
             <name>OSS Sonatype</name>
@@ -71,37 +71,37 @@
             <version>${elasticsearch.version}</version>
             <scope>compile</scope>
         </dependency>
-        
+
         <dependency>
-	     <groupId>org.apache.httpcomponents</groupId>
-              <artifactId>httpclient</artifactId>
-	     <version>4.4.1</version>
-	</dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+        </dependency>
 
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <version>1.2.17</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3.RC2</version>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3.RC2</version>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -111,10 +111,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.5.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -166,7 +166,7 @@
             </plugin>
         </plugins>
     </build>
-        <profiles>
+    <profiles>
         <profile>
             <id>disable-java8-doclint</id>
             <activation>