Skip to content

Commit bc04657

Browse files
Convert transport-reactor-netty4 to use gradle version catalog (#17233) (#17276)
* Move transport-nio and transport-reactor-netty4 to use gradle version catalog * Add to CHANGELOG * test dependabot * Monitor root dir * Reference version catalog in settings.gradle * Add mavenCentral * Remove section from settings.gradle * Test 2 repositories sections * Add separate repositories section for dependency resolution * Remove top-level repositories * Revert changes in dependabot.yml * Update CHANGELOG entry * Remove files from transport-nio * Hyphenate the dependency * Switch CHANGELOG --------- (cherry picked from commit 8089b61) Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 757f33e commit bc04657

File tree

4 files changed

+45
-20
lines changed

4 files changed

+45
-20
lines changed

CHANGELOG.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
8585
- 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))
8686
- Allow extended plugins to be optional ([#16909](https://github.com/opensearch-project/OpenSearch/pull/16909))
8787
- Use the correct type to widen the sort fields when merging top docs ([#16881](https://github.com/opensearch-project/OpenSearch/pull/16881))
88-
- Limit reader writer separation to remote store enabled clusters [#16760](https://github.com/opensearch-project/OpenSearch/pull/16760)
89-
- Optimize innerhits query performance [#16937](https://github.com/opensearch-project/OpenSearch/pull/16937)
88+
- Limit reader writer separation to remote store enabled clusters ([#16760](https://github.com/opensearch-project/OpenSearch/pull/16760)
89+
- Optimize innerhits query performance ([#16937](https://github.com/opensearch-project/OpenSearch/pull/16937)
90+
- Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233))
9091

9192
### Deprecated
9293
- Performing update operation with default pipeline or final pipeline is deprecated ([#16712](https://github.com/opensearch-project/OpenSearch/pull/16712))

gradle/libs.versions.toml

+37-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jzlib = { group = "com.jcraft", name = "jzlib", version.ref = "jzlib" }
9393
log4japi = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
9494
log4jjul = { group = "org.apache.logging.log4j", name = "log4j-jul", version.ref = "log4j" }
9595
log4jcore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
96+
log4jslf4jimpl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" }
9697
lucene-core = { group = "org.apache.lucene", name = "lucene-core", version.ref = "lucene" }
9798
lucene-analysis-common = { group = "org.apache.lucene", name = "lucene-analysis-common", version.ref = "lucene" }
9899
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
107108
lucene-spatial-extras = { group = "org.apache.lucene", name = "lucene-spatial-extras", version.ref = "lucene" }
108109
lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", version.ref = "lucene" }
109110
lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" }
111+
netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" }
112+
netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" }
113+
netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" }
114+
netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" }
115+
netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" }
116+
netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" }
117+
netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }
118+
netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" }
119+
netty-resolver = { group = "io.netty", name = "netty-resolver", version.ref = "netty" }
120+
netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" }
121+
netty-transport-native-unix-common = { group = "io.netty", name = "netty-transport-native-unix-common", version.ref = "netty" }
110122
protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
111-
reactivestreams = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
112-
reactorcore = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
123+
reactivestreams = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
124+
reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
125+
reactor-test = { group = "io.projectreactor", name = "reactor-test", version.ref = "reactor" }
126+
reactor-netty-core = { group = "io.projectreactor.netty", name = "reactor-netty-core", version.ref = "reactor_netty" }
127+
reactor-netty-http = { group = "io.projectreactor.netty", name = "reactor-netty-http", version.ref = "reactor_netty" }
128+
113129
roaringbitmap = { group = "org.roaringbitmap", name = "RoaringBitmap", version.ref = "roaringbitmap" }
114130
spatial4j = { group = "org.locationtech.spatial4j", name = "spatial4j", version.ref = "spatial4j" }
115131
tdigest = { group = "com.tdunning", name = "t-digest", version.ref = "tdigest" }
@@ -131,3 +147,22 @@ lucene = [
131147
"lucene-spatial3d",
132148
"lucene-suggest"
133149
]
150+
151+
netty = [
152+
"netty-buffer",
153+
"netty-codec",
154+
"netty-codec-dns",
155+
"netty-codec-http",
156+
"netty-codec-http2",
157+
"netty-common",
158+
"netty-handler",
159+
"netty-resolver-dns",
160+
"netty-resolver",
161+
"netty-transport",
162+
"netty-transport-native-unix-common"
163+
]
164+
165+
reactornetty = [
166+
"reactor-netty-core",
167+
"reactor-netty-http"
168+
]

plugins/transport-reactor-netty4/build.gradle

+4-15
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,12 @@ opensearchplugin {
3030

3131
dependencies {
3232
// network stack
33-
api "io.netty:netty-buffer:${versions.netty}"
34-
api "io.netty:netty-codec:${versions.netty}"
35-
api "io.netty:netty-codec-dns:${versions.netty}"
36-
api "io.netty:netty-codec-http:${versions.netty}"
37-
api "io.netty:netty-codec-http2:${versions.netty}"
38-
api "io.netty:netty-common:${versions.netty}"
39-
api "io.netty:netty-handler:${versions.netty}"
40-
api "io.netty:netty-resolver-dns:${versions.netty}"
41-
api "io.netty:netty-resolver:${versions.netty}"
42-
api "io.netty:netty-transport:${versions.netty}"
43-
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
33+
api libs.bundles.netty
4434

45-
api "io.projectreactor.netty:reactor-netty-http:${versions.reactor_netty}"
46-
api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}"
35+
api libs.bundles.reactornetty
4736

48-
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
49-
javaRestTestImplementation "io.projectreactor:reactor-test:${versions.reactor}"
37+
testImplementation libs.log4jslf4jimpl
38+
javaRestTestImplementation libs.reactor.test
5039
testImplementation project(":modules:transport-netty4")
5140
}
5241

server/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dependencies {
104104
api libs.jzlib
105105

106106
// reactor
107-
api libs.reactorcore
107+
api libs.reactor.core
108108
api libs.reactivestreams
109109

110110
// protobuf

0 commit comments

Comments
 (0)