From e97632eb6ff42ce1cb77dab7ec53c9c8d4f198b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jan 2026 07:59:25 -0500 Subject: [PATCH] Bump org.apache.httpcomponents.client5:httpclient5 from 5.5.1 to 5.6 (#1844) * Bump org.apache.httpcomponents.client5:httpclient5 from 5.5.1 to 5.6 Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.5.1 to 5.6. - [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.5.1...rel/v5.6) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-version: '5.6' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] * Align with OpenSearch 3.5.0 changes Signed-off-by: Andriy Redko --------- Signed-off-by: dependabot[bot] Signed-off-by: Andriy Redko Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko (cherry picked from commit a695f49bbe3ee974361e5140e062dcd9dc3d0389) Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + java-client/build.gradle.kts | 22 +++++++++---------- .../ApacheHttpClient5Transport.java | 7 ------ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6666d3ad2d..1b4f667d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added ### Dependencies +- Bump `org.apache.httpcomponents.client5:httpclient5` from 5.5 to 5.6 [#1844](https://github.com/opensearch-project/opensearch-java/pull/1844) ### Changed diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 7fe6efd354..0ab67280e7 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -176,11 +176,11 @@ val integrationTest = task("integrationTest") { System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1")) } -val opensearchVersion = "3.0.0-SNAPSHOT" +val opensearchVersion = "3.5.0-SNAPSHOT" dependencies { - val jacksonVersion = "2.18.3" - val jacksonDatabindVersion = "2.18.3" + val jacksonVersion = "2.20.1" + val jacksonDatabindVersion = "2.20.1" // Apache 2.0 api("commons-logging:commons-logging:1.3.5") @@ -191,11 +191,11 @@ dependencies { } testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion) - api("org.apache.httpcomponents.client5:httpclient5:5.5") { + api("org.apache.httpcomponents.client5:httpclient5:5.6") { exclude(group = "org.apache.httpcomponents.core5") } - api("org.apache.httpcomponents.core5:httpcore5:5.3.4") - api("org.apache.httpcomponents.core5:httpcore5-h2:5.3.4") + api("org.apache.httpcomponents.core5:httpcore5:5.4") + api("org.apache.httpcomponents.core5:httpcore5-h2:5.4") // Apache 2.0 // https://search.maven.org/artifact/com.google.code.findbugs/jsr305 @@ -250,6 +250,10 @@ dependencies { testImplementation("junit", "junit" , "4.13.2") { exclude(group = "org.hamcrest") } + + // The Bouncy Castle License (MIT): https://www.bouncycastle.org/licence.html + testImplementation("org.bouncycastle", "bcprov-lts8on", "2.73.6") + testImplementation("org.bouncycastle", "bcpkix-lts8on", "2.73.6") } licenseReport { @@ -399,10 +403,4 @@ if (runtimeJavaVersion >= JavaVersion.VERSION_21) { testClassesDirs += java21.output.classesDirs classpath = sourceSets["java21"].runtimeClasspath } -} else { - dependencies { - // The Bouncy Castle License (MIT): https://www.bouncycastle.org/licence.html - testImplementation("org.bouncycastle", "bcprov-lts8on", "2.73.6") - testImplementation("org.bouncycastle", "bcpkix-lts8on", "2.73.6") - } } \ No newline at end of file diff --git a/java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java b/java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java index 92bf5d2bd9..58644b5b69 100644 --- a/java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java +++ b/java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java @@ -56,7 +56,6 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.classic.methods.HttpHead; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; -import org.apache.hc.client5.http.entity.GzipDecompressingEntity; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.auth.BasicAuthCache; import org.apache.hc.client5.http.impl.auth.BasicScheme; @@ -304,12 +303,6 @@ private ResponseOrResponseException convertResponse( ) throws IOException { int statusCode = httpResponse.getCode(); - Optional.ofNullable(httpResponse.getEntity()) - .map(HttpEntity::getContentEncoding) - .filter("gzip"::equalsIgnoreCase) - .map(gzipHeaderValue -> new GzipDecompressingEntity(httpResponse.getEntity())) - .ifPresent(httpResponse::setEntity); - Response response = new Response(new RequestLine(request), node.getHost(), httpResponse); Set ignoreErrorCodes = getIgnoreErrorCodes("400,401,403,404,405", request.getMethod()); if (isSuccessfulResponse(statusCode) || ignoreErrorCodes.contains(response.getStatusLine().getStatusCode())) {