From 7dd9b2abe4a6592951501ceb15013c3f6fa408de Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Tue, 25 Oct 2022 15:56:54 -0700 Subject: [PATCH] Bump reactor-netty-http to 1.0.24 in repository-azure (#4880) (#4920) * Bump reactor-netty-http to 1.0.24 in repository-azure (#4880) * Bump reactor-netty-http to 1.0.24 Signed-off-by: Ryan Bogan * Add CHANGELOG entry Signed-off-by: Ryan Bogan * Bump reactor-netty-core to 1.0.24 to fix failing tests Signed-off-by: Ryan Bogan * Update SHAs Signed-off-by: Ryan Bogan * Addressed PR Comments Signed-off-by: Ryan Bogan Signed-off-by: Ryan Bogan Signed-off-by: Vacha Shah * Removing old SHAs and fixing CHANGELOG Signed-off-by: Vacha Shah * Bumping reactor-core to 3.4.23 Signed-off-by: Vacha Shah Signed-off-by: Ryan Bogan Signed-off-by: Vacha Shah Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com> --- CHANGELOG.md | 3 ++- plugins/repository-azure/build.gradle | 6 +++--- .../repository-azure/licenses/reactor-core-3.4.15.jar.sha1 | 1 - .../repository-azure/licenses/reactor-core-3.4.23.jar.sha1 | 1 + .../licenses/reactor-netty-core-1.0.16.jar.sha1 | 1 - .../licenses/reactor-netty-core-1.0.24.jar.sha1 | 1 + .../licenses/reactor-netty-http-1.0.16.jar.sha1 | 1 - .../licenses/reactor-netty-http-1.0.24.jar.sha1 | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 plugins/repository-azure/licenses/reactor-core-3.4.15.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.0.16.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.0.16.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 76b0013e1d1aa..43aa6c1edff06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `commons-configuration2` from 2.7 to 2.8 - Exclude jettison version brought in with hadoop-minicluster. ([#4787](https://github.com/opensearch-project/OpenSearch/pull/4787)) - Updating bundled JDK to 11.0.16.1+1 and 8u345-b01 ([#4888](https://github.com/opensearch-project/OpenSearch/pull/4888)) -- Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs ([#]()) +- Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs ([#4890](https://github.com/opensearch-project/OpenSearch/pull/4890)) - Upgrade netty to 4.1.84.Final ([#4893](https://github.com/opensearch-project/OpenSearch/pull/4893)) +- Bump reactor-netty-http to 1.0.24 in repository-azure ([#4920](https://github.com/opensearch-project/OpenSearch/pull/4920)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index a491e766eb7c7..821cc7592c290 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -56,10 +56,10 @@ dependencies { implementation project(':modules:transport-netty4') api 'com.azure:azure-storage-blob:12.14.4' api 'org.reactivestreams:reactive-streams:1.0.3' - api 'io.projectreactor:reactor-core:3.4.15' + api 'io.projectreactor:reactor-core:3.4.23' api 'io.projectreactor.netty:reactor-netty:1.0.16' - api 'io.projectreactor.netty:reactor-netty-core:1.0.16' - api 'io.projectreactor.netty:reactor-netty-http:1.0.16' + api 'io.projectreactor.netty:reactor-netty-core:1.0.24' + api 'io.projectreactor.netty:reactor-netty-http:1.0.24' api "org.slf4j:slf4j-api:${versions.slf4j}" api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" diff --git a/plugins/repository-azure/licenses/reactor-core-3.4.15.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.15.jar.sha1 deleted file mode 100644 index a89de48b20b51..0000000000000 --- a/plugins/repository-azure/licenses/reactor-core-3.4.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -28ccf513fe64709c8ded30ea3f387fc718db9626 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 new file mode 100644 index 0000000000000..e398f1672188c --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-core-3.4.23.jar.sha1 @@ -0,0 +1 @@ +94bb06e2c4e6968c6faf4f5363cb278351f44a6a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.16.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.16.jar.sha1 deleted file mode 100644 index 0d1a0cb20c80f..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-core-1.0.16.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8f842a912677f2bc614ff60fb9e786d4fa429c34 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 new file mode 100644 index 0000000000000..3f5c8670c6c00 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.0.24.jar.sha1 @@ -0,0 +1 @@ +feaecb39237170aafb23935e9b383e8dda281379 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.16.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.16.jar.sha1 deleted file mode 100644 index d737315b06b62..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-http-1.0.16.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93edb9a1dc774d843551a616e0f316e11ffa81ed \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 new file mode 100644 index 0000000000000..aa0ca72e38cd0 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.0.24.jar.sha1 @@ -0,0 +1 @@ +2fac480a17f752335318f103ab91427bdfb7716a \ No newline at end of file