From d269621203fd30e057edd84a9288dc514cb57e4a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 6 Jul 2023 16:16:31 -0400 Subject: [PATCH 1/2] Set httpcore5 to 5.2 to be compatible with httpclient5 5.2.1 Signed-off-by: Craig Perkins --- buildSrc/version.properties | 2 +- client/rest/licenses/httpcore5-5.2.2.jar.sha1 | 1 - client/rest/licenses/httpcore5-5.2.jar.sha1 | 1 + client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1 | 1 - client/rest/licenses/httpcore5-h2-5.2.jar.sha1 | 1 + client/sniffer/licenses/httpcore5-5.2.2.jar.sha1 | 1 - client/sniffer/licenses/httpcore5-5.2.jar.sha1 | 1 + 7 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 client/rest/licenses/httpcore5-5.2.2.jar.sha1 create mode 100644 client/rest/licenses/httpcore5-5.2.jar.sha1 delete mode 100644 client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1 create mode 100644 client/rest/licenses/httpcore5-h2-5.2.jar.sha1 delete mode 100644 client/sniffer/licenses/httpcore5-5.2.2.jar.sha1 create mode 100644 client/sniffer/licenses/httpcore5-5.2.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 408b03e60cc5d..45a3daf2231b7 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -34,7 +34,7 @@ joda = 2.12.2 # client dependencies httpclient5 = 5.2.1 -httpcore5 = 5.2.2 +httpcore5 = 5.2 httpclient = 4.5.14 httpcore = 4.4.16 httpasyncclient = 4.1.5 diff --git a/client/rest/licenses/httpcore5-5.2.2.jar.sha1 b/client/rest/licenses/httpcore5-5.2.2.jar.sha1 deleted file mode 100644 index b641256c7d4a4..0000000000000 --- a/client/rest/licenses/httpcore5-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6da28f5aa6c2b129ef49632e041a5203ce7507b2 \ No newline at end of file diff --git a/client/rest/licenses/httpcore5-5.2.jar.sha1 b/client/rest/licenses/httpcore5-5.2.jar.sha1 new file mode 100644 index 0000000000000..b3addbb7e8fb9 --- /dev/null +++ b/client/rest/licenses/httpcore5-5.2.jar.sha1 @@ -0,0 +1 @@ +ab7d251b8dfa3f2878f1eefbcca0e1fc0ebeba27 \ No newline at end of file diff --git a/client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1 b/client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1 deleted file mode 100644 index 94bc0fa49bdb0..0000000000000 --- a/client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -54ee1ed58fe8ac40be1083ea9873a6c734939ab9 \ No newline at end of file diff --git a/client/rest/licenses/httpcore5-h2-5.2.jar.sha1 b/client/rest/licenses/httpcore5-h2-5.2.jar.sha1 new file mode 100644 index 0000000000000..31eeb30377cf9 --- /dev/null +++ b/client/rest/licenses/httpcore5-h2-5.2.jar.sha1 @@ -0,0 +1 @@ +698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16 \ No newline at end of file diff --git a/client/sniffer/licenses/httpcore5-5.2.2.jar.sha1 b/client/sniffer/licenses/httpcore5-5.2.2.jar.sha1 deleted file mode 100644 index b641256c7d4a4..0000000000000 --- a/client/sniffer/licenses/httpcore5-5.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6da28f5aa6c2b129ef49632e041a5203ce7507b2 \ No newline at end of file diff --git a/client/sniffer/licenses/httpcore5-5.2.jar.sha1 b/client/sniffer/licenses/httpcore5-5.2.jar.sha1 new file mode 100644 index 0000000000000..b3addbb7e8fb9 --- /dev/null +++ b/client/sniffer/licenses/httpcore5-5.2.jar.sha1 @@ -0,0 +1 @@ +ab7d251b8dfa3f2878f1eefbcca0e1fc0ebeba27 \ No newline at end of file From 3c1ee941bb8cec6b3fdb36bfe3d1e0f5682d3db8 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 6 Jul 2023 16:20:21 -0400 Subject: [PATCH 2/2] Add CHANGELOG entry Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 619bb0d58d8ae..8a0f8d6171aee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -134,6 +134,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update Apache HttpCore/ HttpClient and Apache HttpCore5 / HttpClient5 dependencies ([#8434](https://github.com/opensearch-project/OpenSearch/pull/8434)) - Bump `org.apache.maven:maven-model` from 3.9.2 to 3.9.3 (#8403) - Bump `io.projectreactor.netty:reactor-netty` and `io.projectreactor.netty:reactor-netty-core` from 1.1.7 to 1.1.8 (#8405) +- 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` ([#8503](https://github.com/opensearch-project/OpenSearch/pull/8503)) ### Changed - Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))