diff --git a/pom.xml b/pom.xml index f826dd4af5..e9532eb18d 100644 --- a/pom.xml +++ b/pom.xml @@ -76,9 +76,9 @@ 33.3.1-jre 4.5.14 4.4.16 - 5.5 - 5.3.4 - 5.3.4 + 5.6.4 + 5.4.3 + 5.4.3 3.1-HTTPCLIENT-1265 2.12.2 26.84.0 @@ -94,7 +94,7 @@ 3.5.0.Final 4.18.3 4.1.137.Final - 6.2.4 + 6.2.7 1.27.1 4.2.2 diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/elasticsearch/client/ElasticsearchHttpClientFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/elasticsearch/client/ElasticsearchHttpClientFactory.java index 18fe5843a6..c3af2b1526 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/elasticsearch/client/ElasticsearchHttpClientFactory.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/elasticsearch/client/ElasticsearchHttpClientFactory.java @@ -427,6 +427,11 @@ public class ElasticsearchHttpClientFactory LOGGER.debug("Using default ioThreadCount for Elasticsearch HTTP Client since the specified value was {}.", threadCount); } + // httpclient5 5.6 auto-negotiates gzip/x-gzip content encoding on the async transport, but the + // OpenSearch client manages compression itself (defaults to none), so transparent decompression + // makes responses hang/fail. Disable it to restore pre-5.6 behaviour. + httpClientBuilder.disableContentCompression(); + httpClientBuilder.setUserAgent(StringUtils.EMPTY).setConnectionManager(connectionBuilder.build()); // Build and set the HTTP/2 response timeout using the configured responseTimeout property