From a4ebe031c25620e86c173aed319c6703c0d8d2a4 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 6 Jul 2023 15:58:38 -0400 Subject: [PATCH] Set httpcore5 to 5.2 to be compatible with httpclient5 5.2.1 Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + java-client/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0168f847e4..45705d7392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `org.ajoberstar.grgit:grgit-gradle` from 5.0.0 to 5.2.0 - Bumps `com.github.jk1.dependency-license-report` from 2.2 to 2.4 - Update `org.apache.httpcomponents.client5:httpclient5` from `5.1.4` to `5.2.1` and `org.apache.httpcomponents.core5:httpcore5` from `5.1.5` to `5.2.2` +- Update `org.apache.httpcomponents.client5:httpcore5` from `5.2.2` to `5.2` to be compatible with `org.apache.httpcomponents.core5:httpclient5:5.2.1` ### Changed - Migrate client transports to Apache HttpClient / Core 5.x ([#246](https://github.com/opensearch-project/opensearch-java/pull/246)) diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 8b624b4256..883b5dada1 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -152,8 +152,8 @@ dependencies { testImplementation("org.opensearch.test", "framework", opensearchVersion) api("org.apache.httpcomponents.client5:httpclient5:5.2.1") - api("org.apache.httpcomponents.core5:httpcore5:5.2.2") - api("org.apache.httpcomponents.core5:httpcore5-h2:5.2.2") + api("org.apache.httpcomponents.core5:httpcore5:5.2") + api("org.apache.httpcomponents.core5:httpcore5-h2:5.2") // Apache 2.0 // https://search.maven.org/artifact/com.google.code.findbugs/jsr305