Skip to content

Commit 8089b61

Browse files
cwperkscwperks
authored
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 <cwperx@amazon.com> * Add to CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> * test dependabot Signed-off-by: Craig Perkins <cwperx@amazon.com> * Monitor root dir Signed-off-by: Craig Perkins <cwperx@amazon.com> * Reference version catalog in settings.gradle Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add mavenCentral Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove section from settings.gradle Signed-off-by: Craig Perkins <cwperx@amazon.com> * Test 2 repositories sections Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add separate repositories section for dependency resolution Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove top-level repositories Signed-off-by: Craig Perkins <cwperx@amazon.com> * Revert changes in dependabot.yml Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update CHANGELOG entry Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove files from transport-nio Signed-off-by: Craig Perkins <cwperx@amazon.com> * Hyphenate the dependency Signed-off-by: Craig Perkins <cwperx@amazon.com> * Switch CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent b823d1f commit 8089b61

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

9394
### Deprecated
9495
- 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
@@ -95,6 +95,7 @@ jzlib = { group = "com.jcraft", name = "jzlib", version.ref = "jzlib" }
9595
log4japi = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
9696
log4jjul = { group = "org.apache.logging.log4j", name = "log4j-jul", version.ref = "log4j" }
9797
log4jcore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
98+
log4jslf4jimpl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" }
9899
lucene-core = { group = "org.apache.lucene", name = "lucene-core", version.ref = "lucene" }
99100
lucene-analysis-common = { group = "org.apache.lucene", name = "lucene-analysis-common", version.ref = "lucene" }
100101
lucene-backward-codecs = { group = "org.apache.lucene", name = "lucene-backward-codecs", version.ref = "lucene" }
@@ -109,9 +110,24 @@ lucene-sandbox = { group = "org.apache.lucene", name = "lucene-sandbox", version
109110
lucene-spatial-extras = { group = "org.apache.lucene", name = "lucene-spatial-extras", version.ref = "lucene" }
110111
lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", version.ref = "lucene" }
111112
lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" }
113+
netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" }
114+
netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" }
115+
netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" }
116+
netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" }
117+
netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" }
118+
netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" }
119+
netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }
120+
netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" }
121+
netty-resolver = { group = "io.netty", name = "netty-resolver", version.ref = "netty" }
122+
netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" }
123+
netty-transport-native-unix-common = { group = "io.netty", name = "netty-transport-native-unix-common", version.ref = "netty" }
112124
protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
113-
reactivestreams = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
114-
reactorcore = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
125+
reactivestreams = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
126+
reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
127+
reactor-test = { group = "io.projectreactor", name = "reactor-test", version.ref = "reactor" }
128+
reactor-netty-core = { group = "io.projectreactor.netty", name = "reactor-netty-core", version.ref = "reactor_netty" }
129+
reactor-netty-http = { group = "io.projectreactor.netty", name = "reactor-netty-http", version.ref = "reactor_netty" }
130+
115131
roaringbitmap = { group = "org.roaringbitmap", name = "RoaringBitmap", version.ref = "roaringbitmap" }
116132
spatial4j = { group = "org.locationtech.spatial4j", name = "spatial4j", version.ref = "spatial4j" }
117133
tdigest = { group = "com.tdunning", name = "t-digest", version.ref = "tdigest" }
@@ -133,3 +149,22 @@ lucene = [
133149
"lucene-spatial3d",
134150
"lucene-suggest"
135151
]
152+
153+
netty = [
154+
"netty-buffer",
155+
"netty-codec",
156+
"netty-codec-dns",
157+
"netty-codec-http",
158+
"netty-codec-http2",
159+
"netty-common",
160+
"netty-handler",
161+
"netty-resolver-dns",
162+
"netty-resolver",
163+
"netty-transport",
164+
"netty-transport-native-unix-common"
165+
]
166+
167+
reactornetty = [
168+
"reactor-netty-core",
169+
"reactor-netty-http"
170+
]

‎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)