Merge pull request #54 from personium/develop

Release v1_es6.6.1_5
personium · Jun 21, 2019 · 485547d · 485547d
2 parents 498861a + c2ce2ca
commit 485547d
Show file tree

Hide file tree

Showing 4 changed files with 325 additions and 199 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>io.personium</groupId>
     <artifactId>personium-lib-es-adapter</artifactId>
     <packaging>jar</packaging>
-    <version>1_es6.6.1_4</version>
+    <version>1_es6.6.1_5</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -297,5 +297,11 @@
             <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
+        <!-- If elasticsearch version is upgraded, following dependency may not be needed. -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+            <version>2.11.2</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/io/personium/common/es/impl/EsIndexImpl.java b/src/main/java/io/personium/common/es/impl/EsIndexImpl.java
@@ -211,7 +211,7 @@ public Void updateSettings(String index, Map<String, String> settings) {
      */
     class CreateRetryableRequest extends AbstractRetryableEsRequest<CreateIndexResponse> {
         String name;
-        String [] types;
+        String[] types;
         Map<String, JSONObject> mappings;
 
         CreateRetryableRequest(int retryCount, long retryInterval,