Skip to content

Commit e97632e

Browse files
dependabot[bot]reta
andcommitted
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](apache/httpcomponents-client@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] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> * Align with OpenSearch 3.5.0 changes Signed-off-by: Andriy Redko <drreta@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Andriy Redko <drreta@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com> (cherry picked from commit a695f49) Signed-off-by: Andriy Redko <drreta@gmail.com>
1 parent 58437cb commit e97632e

3 files changed

Lines changed: 11 additions & 19 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
### Added
66

77
### Dependencies
8+
- Bump `org.apache.httpcomponents.client5:httpclient5` from 5.5 to 5.6 [#1844](https://github.com/opensearch-project/opensearch-java/pull/1844)
89

910
### Changed
1011

java-client/build.gradle.kts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ val integrationTest = task<Test>("integrationTest") {
176176
System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1"))
177177
}
178178

179-
val opensearchVersion = "3.0.0-SNAPSHOT"
179+
val opensearchVersion = "3.5.0-SNAPSHOT"
180180

181181
dependencies {
182-
val jacksonVersion = "2.18.3"
183-
val jacksonDatabindVersion = "2.18.3"
182+
val jacksonVersion = "2.20.1"
183+
val jacksonDatabindVersion = "2.20.1"
184184

185185
// Apache 2.0
186186
api("commons-logging:commons-logging:1.3.5")
@@ -191,11 +191,11 @@ dependencies {
191191
}
192192
testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
193193

194-
api("org.apache.httpcomponents.client5:httpclient5:5.5") {
194+
api("org.apache.httpcomponents.client5:httpclient5:5.6") {
195195
exclude(group = "org.apache.httpcomponents.core5")
196196
}
197-
api("org.apache.httpcomponents.core5:httpcore5:5.3.4")
198-
api("org.apache.httpcomponents.core5:httpcore5-h2:5.3.4")
197+
api("org.apache.httpcomponents.core5:httpcore5:5.4")
198+
api("org.apache.httpcomponents.core5:httpcore5-h2:5.4")
199199

200200
// Apache 2.0
201201
// https://search.maven.org/artifact/com.google.code.findbugs/jsr305
@@ -250,6 +250,10 @@ dependencies {
250250
testImplementation("junit", "junit" , "4.13.2") {
251251
exclude(group = "org.hamcrest")
252252
}
253+
254+
// The Bouncy Castle License (MIT): https://www.bouncycastle.org/licence.html
255+
testImplementation("org.bouncycastle", "bcprov-lts8on", "2.73.6")
256+
testImplementation("org.bouncycastle", "bcpkix-lts8on", "2.73.6")
253257
}
254258

255259
licenseReport {
@@ -399,10 +403,4 @@ if (runtimeJavaVersion >= JavaVersion.VERSION_21) {
399403
testClassesDirs += java21.output.classesDirs
400404
classpath = sourceSets["java21"].runtimeClasspath
401405
}
402-
} else {
403-
dependencies {
404-
// The Bouncy Castle License (MIT): https://www.bouncycastle.org/licence.html
405-
testImplementation("org.bouncycastle", "bcprov-lts8on", "2.73.6")
406-
testImplementation("org.bouncycastle", "bcpkix-lts8on", "2.73.6")
407-
}
408406
}

java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import org.apache.hc.client5.http.auth.CredentialsProvider;
5757
import org.apache.hc.client5.http.classic.methods.HttpHead;
5858
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
59-
import org.apache.hc.client5.http.entity.GzipDecompressingEntity;
6059
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
6160
import org.apache.hc.client5.http.impl.auth.BasicAuthCache;
6261
import org.apache.hc.client5.http.impl.auth.BasicScheme;
@@ -304,12 +303,6 @@ private ResponseOrResponseException convertResponse(
304303
) throws IOException {
305304
int statusCode = httpResponse.getCode();
306305

307-
Optional.ofNullable(httpResponse.getEntity())
308-
.map(HttpEntity::getContentEncoding)
309-
.filter("gzip"::equalsIgnoreCase)
310-
.map(gzipHeaderValue -> new GzipDecompressingEntity(httpResponse.getEntity()))
311-
.ifPresent(httpResponse::setEntity);
312-
313306
Response response = new Response(new RequestLine(request), node.getHost(), httpResponse);
314307
Set<Integer> ignoreErrorCodes = getIgnoreErrorCodes("400,401,403,404,405", request.getMethod());
315308
if (isSuccessfulResponse(statusCode) || ignoreErrorCodes.contains(response.getStatusLine().getStatusCode())) {

0 commit comments

Comments
 (0)