Skip to content

Commit 2fddcd8

Browse files
retasandeshkr419
andauthored
Update to Netty 4.2 (opensearch-project#19178)
Signed-off-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com> Co-authored-by: Sandesh Kumar <sandeshkr419@gmail.com>
1 parent 48b4427 commit 2fddcd8

File tree

151 files changed

+279
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+279
-291
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions

client/rest/licenses/reactor-core-3.7.5.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
21d51d40dda28f8cc3ab9a22fb35dd6146e4323b

gradle/libs.versions.toml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ json_smart = "2.5.2"
3535
# when updating the JNA version, also update the version in buildSrc/build.gradle
3636
jna = "5.16.0"
3737

38-
netty = "4.1.125.Final"
38+
netty = "4.2.7.Final"
3939
joda = "2.12.7"
4040
roaringbitmap = "1.3.0"
4141

4242
# project reactor
43-
reactor_netty = "1.2.9"
44-
reactor = "3.7.5"
43+
reactor_netty = "1.3.0"
44+
reactor = "3.8.0"
4545

4646
# client dependencies
4747
httpclient5 = "5.4.4"
@@ -143,15 +143,19 @@ lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", ver
143143
lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" }
144144
netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" }
145145
netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" }
146+
netty-codec-base = { group = "io.netty", name = "netty-codec-base", version.ref = "netty" }
147+
netty-codec-compression = { group = "io.netty", name = "netty-codec-compression", version.ref = "netty" }
146148
netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" }
147149
netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" }
148150
netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" }
151+
netty-codec-http3 = { group = "io.netty", name = "netty-codec-http3", version.ref = "netty" }
149152
netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" }
150153
netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }
151154
netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" }
152155
netty-resolver = { group = "io.netty", name = "netty-resolver", version.ref = "netty" }
153156
netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" }
154157
netty-transport-native-unix-common = { group = "io.netty", name = "netty-transport-native-unix-common", version.ref = "netty" }
158+
netty-pkitesting = { group = "io.netty", name = "netty-pkitesting", version.ref = "netty" }
155159
protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
156160
reactivestreams = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
157161
reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
@@ -190,7 +194,9 @@ lucene = [
190194

191195
netty = [
192196
"netty-buffer",
197+
"netty-codec-base",
193198
"netty-codec",
199+
"netty-codec-compression",
194200
"netty-codec-dns",
195201
"netty-codec-http",
196202
"netty-codec-http2",

modules/transport-netty4/build.gradle

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ opensearchplugin {
5757
dependencies {
5858
// network stack
5959
api "io.netty:netty-buffer:${versions.netty}"
60+
api "io.netty:netty-codec-base:${versions.netty}"
61+
api "io.netty:netty-codec-compression:${versions.netty}"
6062
api "io.netty:netty-codec:${versions.netty}"
6163
api "io.netty:netty-codec-http:${versions.netty}"
6264
api "io.netty:netty-codec-http2:${versions.netty}"
@@ -158,34 +160,13 @@ thirdPartyAudit {
158160
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
159161
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',
160162

161-
// from io.netty.handler.ssl.JettyNpnSslEngine (netty)
162-
'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',
163-
'org.eclipse.jetty.npn.NextProtoNego$ServerProvider',
164-
'org.eclipse.jetty.npn.NextProtoNego',
165-
166-
// from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty)
167-
'org.jboss.marshalling.ByteInput',
168-
169-
// from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty)
170-
'org.jboss.marshalling.ByteOutput',
171-
172-
// from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty)
173-
'org.jboss.marshalling.Marshaller',
174-
175-
// from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty)
176-
'org.jboss.marshalling.MarshallerFactory',
177-
'org.jboss.marshalling.MarshallingConfiguration',
178-
'org.jboss.marshalling.Unmarshaller',
179-
180163
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
181164
'org.slf4j.helpers.FormattingTuple',
182165
'org.slf4j.helpers.MessageFormatter',
183166
'org.slf4j.Logger',
184167
'org.slf4j.LoggerFactory',
185168
'org.slf4j.spi.LocationAwareLogger',
186169

187-
'com.google.protobuf.nano.CodedOutputByteBufferNano',
188-
'com.google.protobuf.nano.MessageNano',
189170
'com.ning.compress.BufferRecycler',
190171
'com.ning.compress.lzf.ChunkDecoder',
191172
'com.ning.compress.lzf.ChunkEncoder',
@@ -209,26 +190,38 @@ thirdPartyAudit {
209190
'io.netty.internal.tcnative.SSL',
210191
'io.netty.internal.tcnative.SSLSession',
211192
'io.netty.internal.tcnative.SSLSessionCache',
212-
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
213-
'org.eclipse.jetty.alpn.ALPN$ServerProvider',
214-
'org.eclipse.jetty.alpn.ALPN',
215193

216194
'org.conscrypt.AllocatedBuffer',
217195
'org.conscrypt.BufferAllocator',
218196
'org.conscrypt.Conscrypt',
219197
'org.conscrypt.HandshakeListener',
220198

221199
'reactor.blockhound.BlockHound$Builder',
222-
'reactor.blockhound.integration.BlockHoundIntegration'
200+
'reactor.blockhound.integration.BlockHoundIntegration',
201+
202+
'io.netty.pkitesting.CertificateBuilder',
203+
'io.netty.pkitesting.CertificateBuilder$Algorithm',
204+
'io.netty.pkitesting.X509Bundle'
223205
)
224206

225207
ignoreViolations(
208+
'io.netty.buffer.AbstractAllocatorEvent',
209+
'io.netty.buffer.AbstractBufferEvent',
210+
'io.netty.buffer.AbstractChunkEvent',
211+
'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf',
212+
'io.netty.buffer.AdaptivePoolingAllocator$Chunk',
213+
'io.netty.buffer.AllocateBufferEvent',
214+
'io.netty.buffer.AllocateChunkEvent',
215+
'io.netty.buffer.FreeBufferEvent',
216+
'io.netty.buffer.FreeChunkEvent',
217+
'io.netty.buffer.PooledByteBufAllocator',
218+
'io.netty.buffer.ReallocateBufferEvent',
219+
'io.netty.buffer.ReturnChunkEvent',
226220
'io.netty.util.internal.PlatformDependent0',
227221
'io.netty.util.internal.PlatformDependent0$1',
228222
'io.netty.util.internal.PlatformDependent0$2',
229223
'io.netty.util.internal.PlatformDependent0$3',
230-
'io.netty.util.internal.PlatformDependent0$4',
231-
'io.netty.util.internal.PlatformDependent0$6',
224+
'io.netty.util.internal.PlatformDependent0$5',
232225
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
233226
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
234227
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',

modules/transport-netty4/licenses/netty-buffer-4.1.125.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5555ff561643bf2f8430fb57c24403c0efe15994

modules/transport-netty4/licenses/netty-codec-4.1.125.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e47bea286fb06764f48fe7b0d96956c4faa9b4c7
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
915e381ebabcf115f1c7ff7032d55c48afb50210

0 commit comments

Comments
 (0)