diff --git a/plugin.xml b/plugin.xml index 196b6a693..13e87fb5e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -35,8 +35,8 @@ - - + + diff --git a/pom.xml b/pom.xml index 0c37baae3..38ade2620 100644 --- a/pom.xml +++ b/pom.xml @@ -58,14 +58,14 @@ 0.9.1 - 3.2.1-SNAPSHOT + 3.2.1 - 7.2.0 + 7.2.1 - 7.2.0 - 7.2.1-SNAPSHOT + 7.2.1 + 7.2.1 ${elasticsearch.version}.0 @@ -1249,7 +1249,7 @@ org.codelibs corelib - 0.5.1-SNAPSHOT + 0.5.1 org.codelibs diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java index ebdde0ffc..61748152c 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java +++ b/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 contentMap = response.getContent(EcrCurl.jsonParser); + final Map contentMap = response.getContent(EcrCurl.jsonParser()); @SuppressWarnings("unchecked") final List> fileList = (List>) 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 contentMap = response.getContent(EcrCurl.jsonParser); + final Map contentMap = response.getContent(EcrCurl.jsonParser()); if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) { throw new DictionaryException("Failed to update " + dictFile.getPath()); } diff --git a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java index 96f6483c0..eb967ec1d 100644 --- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java +++ b/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 contentMap = response.getContent(EcrCurl.jsonParser); + final Map 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 contentMap = response.getContent(EcrCurl.jsonParser); + final Map 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 contentMap = response.getContent(EcrCurl.jsonParser); + final Map contentMap = response.getContent(EcrCurl.jsonParser()); if (logger.isDebugEnabled()) { logger.debug("response: {}", contentMap); }