浏览代码

sync up with elasticsearch 7.2.1

Shinsuke Sugaya 6 年之前
父节点
当前提交
d00de1f45d

+ 2 - 2
plugin.xml

@@ -35,8 +35,8 @@
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="7.2.0" />
-			<param name="plugin.zip.version" value="7.2.0" />
+			<param name="plugin.version" value="7.2.1" />
+			<param name="plugin.zip.version" value="7.2.1" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">

+ 5 - 5
pom.xml

@@ -58,14 +58,14 @@
 		<utflute.version>0.9.1</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>3.2.1-SNAPSHOT</crawler.version>
+		<crawler.version>3.2.1</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>7.2.0</suggest.version>
+		<suggest.version>7.2.1</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>7.2.0</elasticsearch.version>
-		<elasticsearch.httpclient.version>7.2.1-SNAPSHOT</elasticsearch.httpclient.version>
+		<elasticsearch.version>7.2.1</elasticsearch.version>
+		<elasticsearch.httpclient.version>7.2.1</elasticsearch.httpclient.version>
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 
 		<!-- Tomcat -->
@@ -1249,7 +1249,7 @@
 		<dependency>
 			<groupId>org.codelibs</groupId>
 			<artifactId>corelib</artifactId>
-			<version>0.5.1-SNAPSHOT</version>
+			<version>0.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codelibs</groupId>

+ 2 - 2
src/main/java/org/codelibs/fess/dict/DictionaryManager.java

@@ -50,7 +50,7 @@ public class DictionaryManager {
         try (CurlResponse response =
                 ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
                         .param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
-            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser);
+            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
             @SuppressWarnings("unchecked")
             final List<Map<String, Object>> fileList = (List<Map<String, Object>>) contentMap.get("file");
             return fileList
@@ -96,7 +96,7 @@ public class DictionaryManager {
                 try (CurlResponse response =
                         ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
                                 .body(FileUtil.readUTF8(file)).execute()) {
-                    final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser);
+                    final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
                     if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
                         throw new DictionaryException("Failed to update " + dictFile.getPath());
                     }

+ 3 - 3
src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java

@@ -357,7 +357,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
         try (CurlResponse response =
                 Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                         .header("Accept", "application/json").execute()) {
-            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser);
+            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
             if (logger.isDebugEnabled()) {
                 logger.debug("response: {}", contentMap);
             }
@@ -439,7 +439,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
                                 Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                                         .header("Accept", "application/json").header("Content-type", "application/json")
                                         .body("{\"securityEnabledOnly\":false}").execute()) {
-                            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser);
+                            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
                             if (logger.isDebugEnabled()) {
                                 logger.debug("response: {}", contentMap);
                             }
@@ -478,7 +478,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
         try (CurlResponse response =
                 Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
                         .header("Accept", "application/json").execute()) {
-            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser);
+            final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
             if (logger.isDebugEnabled()) {
                 logger.debug("response: {}", contentMap);
             }