Skip to content

[Backport] [3.x] Bump org.apache.httpcomponents.client5:httpclient5 from 5.5.1 to 5.6 (#1844) #1851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reta wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

[Backport] [3.x] Bump org.apache.httpcomponents.client5:httpclient5 from 5.5.1 to 5.6 (#1844) #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 10 additions & 12 deletions java-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ val integrationTest = task<Test>("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")
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
}
}
7 changes: 0 additions & 7 deletions ...src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<Integer> ignoreErrorCodes = getIgnoreErrorCodes("400,401,403,404,405", request.getMethod());
if (isSuccessfulResponse(statusCode) || ignoreErrorCodes.contains(response.getStatusLine().getStatusCode())) {
Expand Down
Loading