From acbe61b0ad00fe3fa19d01575c6bdba31ddb111c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 6 Feb 2025 16:16:57 +0000 Subject: [PATCH] Convert transport-reactor-netty4 to use gradle version catalog (#17233) * Move transport-nio and transport-reactor-netty4 to use gradle version catalog Signed-off-by: Craig Perkins * Add to CHANGELOG Signed-off-by: Craig Perkins * test dependabot Signed-off-by: Craig Perkins * Monitor root dir Signed-off-by: Craig Perkins * Reference version catalog in settings.gradle Signed-off-by: Craig Perkins * Add mavenCentral Signed-off-by: Craig Perkins * Remove section from settings.gradle Signed-off-by: Craig Perkins * Test 2 repositories sections Signed-off-by: Craig Perkins * Add separate repositories section for dependency resolution Signed-off-by: Craig Perkins * Remove top-level repositories Signed-off-by: Craig Perkins * Revert changes in dependabot.yml Signed-off-by: Craig Perkins * Update CHANGELOG entry Signed-off-by: Craig Perkins * Remove files from transport-nio Signed-off-by: Craig Perkins * Hyphenate the dependency Signed-off-by: Craig Perkins * Switch CHANGELOG Signed-off-by: Craig Perkins --------- Signed-off-by: Craig Perkins (cherry picked from commit 8089b618e3c7699a457cc4f55c7cfca7fdfca291) Signed-off-by: github-actions[bot] --- CHANGELOG.md | 5 ++- gradle/libs.versions.toml | 39 ++++++++++++++++++- plugins/transport-reactor-netty4/build.gradle | 19 ++------- server/build.gradle | 2 +- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6e6216c51f5d..9f9f4e1a67d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,8 +85,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Sliced search only fans out to shards matched by the selected slice, reducing open search contexts ([#16771](https://github.com/opensearch-project/OpenSearch/pull/16771)) - Allow extended plugins to be optional ([#16909](https://github.com/opensearch-project/OpenSearch/pull/16909)) - Use the correct type to widen the sort fields when merging top docs ([#16881](https://github.com/opensearch-project/OpenSearch/pull/16881)) -- Limit reader writer separation to remote store enabled clusters [#16760](https://github.com/opensearch-project/OpenSearch/pull/16760) -- Optimize innerhits query performance [#16937](https://github.com/opensearch-project/OpenSearch/pull/16937) +- Limit reader writer separation to remote store enabled clusters ([#16760](https://github.com/opensearch-project/OpenSearch/pull/16760) +- Optimize innerhits query performance ([#16937](https://github.com/opensearch-project/OpenSearch/pull/16937) +- Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233)) ### Deprecated - Performing update operation with default pipeline or final pipeline is deprecated ([#16712](https://github.com/opensearch-project/OpenSearch/pull/16712)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31f8b8a057148..b9d58df134b95 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,6 +93,7 @@ jzlib = { group = "com.jcraft", name = "jzlib", version.ref = "jzlib" } log4japi = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } log4jjul = { group = "org.apache.logging.log4j", name = "log4j-jul", version.ref = "log4j" } log4jcore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } +log4jslf4jimpl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" } lucene-core = { group = "org.apache.lucene", name = "lucene-core", version.ref = "lucene" } lucene-analysis-common = { group = "org.apache.lucene", name = "lucene-analysis-common", version.ref = "lucene" } lucene-backward-codecs = { group = "org.apache.lucene", name = "lucene-backward-codecs", version.ref = "lucene" } @@ -107,9 +108,24 @@ lucene-sandbox = { group = "org.apache.lucene", name = "lucene-sandbox", version lucene-spatial-extras = { group = "org.apache.lucene", name = "lucene-spatial-extras", version.ref = "lucene" } lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", version.ref = "lucene" } lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" } +netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" } +netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" } +netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" } +netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" } +netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" } +netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" } +netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" } +netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" } +netty-resolver = { group = "io.netty", name = "netty-resolver", version.ref = "netty" } +netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" } +netty-transport-native-unix-common = { group = "io.netty", name = "netty-transport-native-unix-common", version.ref = "netty" } protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" } -reactivestreams = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" } -reactorcore = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" } +reactivestreams = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" } +reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" } +reactor-test = { group = "io.projectreactor", name = "reactor-test", version.ref = "reactor" } +reactor-netty-core = { group = "io.projectreactor.netty", name = "reactor-netty-core", version.ref = "reactor_netty" } +reactor-netty-http = { group = "io.projectreactor.netty", name = "reactor-netty-http", version.ref = "reactor_netty" } + roaringbitmap = { group = "org.roaringbitmap", name = "RoaringBitmap", version.ref = "roaringbitmap" } spatial4j = { group = "org.locationtech.spatial4j", name = "spatial4j", version.ref = "spatial4j" } tdigest = { group = "com.tdunning", name = "t-digest", version.ref = "tdigest" } @@ -131,3 +147,22 @@ lucene = [ "lucene-spatial3d", "lucene-suggest" ] + +netty = [ + "netty-buffer", + "netty-codec", + "netty-codec-dns", + "netty-codec-http", + "netty-codec-http2", + "netty-common", + "netty-handler", + "netty-resolver-dns", + "netty-resolver", + "netty-transport", + "netty-transport-native-unix-common" +] + +reactornetty = [ + "reactor-netty-core", + "reactor-netty-http" +] diff --git a/plugins/transport-reactor-netty4/build.gradle b/plugins/transport-reactor-netty4/build.gradle index 12ae5ce99632e..ba8b17c5877a7 100644 --- a/plugins/transport-reactor-netty4/build.gradle +++ b/plugins/transport-reactor-netty4/build.gradle @@ -30,23 +30,12 @@ opensearchplugin { dependencies { // network stack - api "io.netty:netty-buffer:${versions.netty}" - api "io.netty:netty-codec:${versions.netty}" - api "io.netty:netty-codec-dns:${versions.netty}" - api "io.netty:netty-codec-http:${versions.netty}" - api "io.netty:netty-codec-http2:${versions.netty}" - api "io.netty:netty-common:${versions.netty}" - api "io.netty:netty-handler:${versions.netty}" - api "io.netty:netty-resolver-dns:${versions.netty}" - api "io.netty:netty-resolver:${versions.netty}" - api "io.netty:netty-transport:${versions.netty}" - api "io.netty:netty-transport-native-unix-common:${versions.netty}" + api libs.bundles.netty - api "io.projectreactor.netty:reactor-netty-http:${versions.reactor_netty}" - api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}" + api libs.bundles.reactornetty - testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" - javaRestTestImplementation "io.projectreactor:reactor-test:${versions.reactor}" + testImplementation libs.log4jslf4jimpl + javaRestTestImplementation libs.reactor.test testImplementation project(":modules:transport-netty4") } diff --git a/server/build.gradle b/server/build.gradle index 873a423b1380f..033150ce570e6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -104,7 +104,7 @@ dependencies { api libs.jzlib // reactor - api libs.reactorcore + api libs.reactor.core api libs.reactivestreams // protobuf