Skip to content

Commit 384128a

Browse files
jakelandissmalyshev
jakelandis
authored and
smalyshev
committed
Bump Netty to 4.1.115.Final (#116696)
This commit bumps Netty from 4.1.109.Final to 4.1.115.Final
1 parent 54d3825 commit 384128a

File tree

4 files changed

+59
-49
lines changed

4 files changed

+59
-49
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log4j = 2.19.0
1414
slf4j = 2.0.6
1515
ecsLogging = 1.2.0
1616
jna = 5.12.1
17-
netty = 4.1.109.Final
17+
netty = 4.1.115.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
2020

‎gradle/verification-metadata.xml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,109 +1366,109 @@
13661366
<sha256 value="a3ebec96768ee4a2d3db44597e84cea2d0bdd68ca04822397980ea9f67075a86" origin="Generated by Gradle"/>
13671367
</artifact>
13681368
</component>
1369-
<component group="io.netty" name="netty-buffer" version="4.1.109.Final">
1370-
<artifact name="netty-buffer-4.1.109.Final.jar">
1371-
<sha256 value="ed49956c1e5d99534af2e9e9ecb80f4d3390c631c6cedd2a94d23aedcc911bb9" origin="Generated by Gradle"/>
1369+
<component group="io.netty" name="netty-buffer" version="4.1.115.Final">
1370+
<artifact name="netty-buffer-4.1.115.Final.jar">
1371+
<sha256 value="4a7b331d3770c566ab70eb02a0d1feed63b95cf6e4d68c8fe778c4c9de2d116d" origin="Generated by Gradle"/>
13721372
</artifact>
13731373
</component>
13741374
<component group="io.netty" name="netty-buffer" version="4.1.42.Final">
13751375
<artifact name="netty-buffer-4.1.42.Final.jar">
13761376
<sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
13771377
</artifact>
13781378
</component>
1379-
<component group="io.netty" name="netty-codec" version="4.1.109.Final">
1380-
<artifact name="netty-codec-4.1.109.Final.jar">
1381-
<sha256 value="2df943cd3ed24f86d61d442314e8a9a4c06b85a9a7aa99cec8c6520e77ff3f1c" origin="Generated by Gradle"/>
1379+
<component group="io.netty" name="netty-codec" version="4.1.115.Final">
1380+
<artifact name="netty-codec-4.1.115.Final.jar">
1381+
<sha256 value="cd189afb70ec6eacfcdfdd3a5f472b4e705a5c91d5bd3ef0386421f2ae15ec77" origin="Generated by Gradle"/>
13821382
</artifact>
13831383
</component>
13841384
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
13851385
<artifact name="netty-codec-4.1.42.Final.jar">
13861386
<sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
13871387
</artifact>
13881388
</component>
1389-
<component group="io.netty" name="netty-codec-dns" version="4.1.109.Final">
1390-
<artifact name="netty-codec-dns-4.1.109.Final.jar">
1391-
<sha256 value="a67a84c0a46094815e2044ac1314d8d81089d219ec8e8c732f9a12ba4cd451bd" origin="Generated by Gradle"/>
1389+
<component group="io.netty" name="netty-codec-dns" version="4.1.115.Final">
1390+
<artifact name="netty-codec-dns-4.1.115.Final.jar">
1391+
<sha256 value="23dd6806bcc326855f13e69838c6411d0490e6b1aeb12e217a19a3dd6ad3f10d" origin="Generated by Gradle"/>
13921392
</artifact>
13931393
</component>
1394-
<component group="io.netty" name="netty-codec-http" version="4.1.109.Final">
1395-
<artifact name="netty-codec-http-4.1.109.Final.jar">
1396-
<sha256 value="fdf056b08e156797d8f6caa727af0370dea8265b1eff8fc6f9e739c5c1f093d1" origin="Generated by Gradle"/>
1394+
<component group="io.netty" name="netty-codec-http" version="4.1.115.Final">
1395+
<artifact name="netty-codec-http-4.1.115.Final.jar">
1396+
<sha256 value="e6dbe971c59373bbae9802021c63b9bc1d8800fead382863d67e79e79b023166" origin="Generated by Gradle"/>
13971397
</artifact>
13981398
</component>
1399-
<component group="io.netty" name="netty-codec-http2" version="4.1.109.Final">
1400-
<artifact name="netty-codec-http2-4.1.109.Final.jar">
1401-
<sha256 value="a75498995087968b4582aefe42cfa8ca257759f32279edbec3c874e54acf633c" origin="Generated by Gradle"/>
1399+
<component group="io.netty" name="netty-codec-http2" version="4.1.115.Final">
1400+
<artifact name="netty-codec-http2-4.1.115.Final.jar">
1401+
<sha256 value="cbed9829a5d582e91e314e209edce9a0c2eb369f23bb4fb74a5bc8b7990222c2" origin="Generated by Gradle"/>
14021402
</artifact>
14031403
</component>
1404-
<component group="io.netty" name="netty-codec-socks" version="4.1.109.Final">
1405-
<artifact name="netty-codec-socks-4.1.109.Final.jar">
1406-
<sha256 value="a8b2c52807e4071f8fdd6239b8fd0c4d2cd282ebf08406f8d431d3229b69418e" origin="Generated by Gradle"/>
1404+
<component group="io.netty" name="netty-codec-socks" version="4.1.115.Final">
1405+
<artifact name="netty-codec-socks-4.1.115.Final.jar">
1406+
<sha256 value="e9b1cc744dc6195894450b1fd4d271a821ab167fe21ae3c459b27cdadc70e81f" origin="Generated by Gradle"/>
14071407
</artifact>
14081408
</component>
1409-
<component group="io.netty" name="netty-common" version="4.1.109.Final">
1410-
<artifact name="netty-common-4.1.109.Final.jar">
1411-
<sha256 value="33bf51077021de2b9d80b9ec64a4fae68f22e6ec56f52431441eaf6dd79cce71" origin="Generated by Gradle"/>
1409+
<component group="io.netty" name="netty-common" version="4.1.115.Final">
1410+
<artifact name="netty-common-4.1.115.Final.jar">
1411+
<sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
14121412
</artifact>
14131413
</component>
14141414
<component group="io.netty" name="netty-common" version="4.1.42.Final">
14151415
<artifact name="netty-common-4.1.42.Final.jar">
14161416
<sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
14171417
</artifact>
14181418
</component>
1419-
<component group="io.netty" name="netty-handler" version="4.1.109.Final">
1420-
<artifact name="netty-handler-4.1.109.Final.jar">
1421-
<sha256 value="1161e2ed8e1f037124a8ddfe3d4184ebaa7be17aea27e7fca87f510f17898ea5" origin="Generated by Gradle"/>
1419+
<component group="io.netty" name="netty-handler" version="4.1.115.Final">
1420+
<artifact name="netty-handler-4.1.115.Final.jar">
1421+
<sha256 value="5972028cc863b74927ce0d11fb8d58f65da2560bef5602fe8ce8903bd306ca07" origin="Generated by Gradle"/>
14221422
</artifact>
14231423
</component>
14241424
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
14251425
<artifact name="netty-handler-4.1.42.Final.jar">
14261426
<sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
14271427
</artifact>
14281428
</component>
1429-
<component group="io.netty" name="netty-handler-proxy" version="4.1.109.Final">
1430-
<artifact name="netty-handler-proxy-4.1.109.Final.jar">
1431-
<sha256 value="42e34c84423f074a4db4576e6d1ddabf56eb26705213e5f9b6ef537ce36bcd0b" origin="Generated by Gradle"/>
1429+
<component group="io.netty" name="netty-handler-proxy" version="4.1.115.Final">
1430+
<artifact name="netty-handler-proxy-4.1.115.Final.jar">
1431+
<sha256 value="807e67cfb17136927d11db42df62031169d1fa0883e13f254906994c84ffbe87" origin="Generated by Gradle"/>
14321432
</artifact>
14331433
</component>
1434-
<component group="io.netty" name="netty-resolver" version="4.1.109.Final">
1435-
<artifact name="netty-resolver-4.1.109.Final.jar">
1436-
<sha256 value="e168920249ea8d65076b0847e64464b5132843f1f1b2ff514e45fa255b64300b" origin="Generated by Gradle"/>
1434+
<component group="io.netty" name="netty-resolver" version="4.1.115.Final">
1435+
<artifact name="netty-resolver-4.1.115.Final.jar">
1436+
<sha256 value="7b3455d14f59828765a00573bc3967dc59379e874bd62a67eb1926d6512109d1" origin="Generated by Gradle"/>
14371437
</artifact>
14381438
</component>
14391439
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
14401440
<artifact name="netty-resolver-4.1.42.Final.jar">
14411441
<sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
14421442
</artifact>
14431443
</component>
1444-
<component group="io.netty" name="netty-resolver-dns" version="4.1.109.Final">
1445-
<artifact name="netty-resolver-dns-4.1.109.Final.jar">
1446-
<sha256 value="7e354a85f8147744aeb9d3e1e64ace18f6432a25c09f8bde57383959a842c967" origin="Generated by Gradle"/>
1444+
<component group="io.netty" name="netty-resolver-dns" version="4.1.115.Final">
1445+
<artifact name="netty-resolver-dns-4.1.115.Final.jar">
1446+
<sha256 value="4aca31593e5896c64ab7e041bbc6c0d851bd9634ec3a4354208141a35576619f" origin="Generated by Gradle"/>
14471447
</artifact>
14481448
</component>
1449-
<component group="io.netty" name="netty-transport" version="4.1.109.Final">
1450-
<artifact name="netty-transport-4.1.109.Final.jar">
1451-
<sha256 value="c1ac17ce337d945290be680d7be942b7b4ff4c989be8ec24c684b3e94438da52" origin="Generated by Gradle"/>
1449+
<component group="io.netty" name="netty-transport" version="4.1.115.Final">
1450+
<artifact name="netty-transport-4.1.115.Final.jar">
1451+
<sha256 value="c3d71faaa736ffd2c9260ab0b498024b814c39c7d764bea8113fa98de6e2bdd2" origin="Generated by Gradle"/>
14521452
</artifact>
14531453
</component>
14541454
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
14551455
<artifact name="netty-transport-4.1.42.Final.jar">
14561456
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
14571457
</artifact>
14581458
</component>
1459-
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.109.Final">
1460-
<artifact name="netty-transport-classes-epoll-4.1.109.Final.jar">
1461-
<sha256 value="02ce34ba9ab6ecc62de667ed35a8680202a902ec6e90bed587bea2e574fae38d" origin="Generated by Gradle"/>
1459+
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.115.Final">
1460+
<artifact name="netty-transport-classes-epoll-4.1.115.Final.jar">
1461+
<sha256 value="40aa67b4463cca0ab346e393c87f6c37e8954d18ec8b78567d95b55aa1f2b3aa" origin="Generated by Gradle"/>
14621462
</artifact>
14631463
</component>
14641464
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
14651465
<artifact name="netty-transport-native-epoll-4.1.42.Final.jar">
14661466
<sha256 value="3c7d659b3bd773e0ea9b7517d2d6baffa275a3d2ae8eb4c10cb8f0a7724b11d5" origin="Generated by Gradle"/>
14671467
</artifact>
14681468
</component>
1469-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.109.Final">
1470-
<artifact name="netty-transport-native-unix-common-4.1.109.Final.jar">
1471-
<sha256 value="61e66832820f257bbee68722ec088b39da383c213eafbd1767097a7fff5d029f" origin="Generated by Gradle"/>
1469+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.115.Final">
1470+
<artifact name="netty-transport-native-unix-common-4.1.115.Final.jar">
1471+
<sha256 value="4b03e716272657c296b0204b57c140b2b2ca96b1a746c92da41f595892ec6d88" origin="Generated by Gradle"/>
14721472
</artifact>
14731473
</component>
14741474
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.42.Final">

‎modules/transport-netty4/build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ tasks.named("thirdPartyAudit").configure {
177177
'com.google.protobuf.nano.CodedOutputByteBufferNano',
178178
'com.google.protobuf.nano.MessageNano',
179179
'com.github.luben.zstd.Zstd',
180-
'com.github.luben.zstd.BaseZstdBufferDecompressingStreamNoFinalizer',
181-
'com.github.luben.zstd.ZstdBufferDecompressingStreamNoFinalizer',
182-
'com.github.luben.zstd.ZstdDirectBufferDecompressingStreamNoFinalizer',
180+
'com.github.luben.zstd.ZstdInputStreamNoFinalizer',
181+
'com.github.luben.zstd.util.Native',
183182
'com.jcraft.jzlib.Deflater',
184183
'com.jcraft.jzlib.Inflater',
185184
'com.jcraft.jzlib.JZlib$WrapperType',
@@ -231,8 +230,14 @@ tasks.named("thirdPartyAudit").configure {
231230
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
232231
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
233232
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
233+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
234+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
235+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
236+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
237+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
234238
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
235239
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
240+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
236241
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
237242
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
238243
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',

‎x-pack/plugin/inference/build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,14 @@ tasks.named("thirdPartyAudit").configure {
205205
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
206206
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
207207
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
208+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
209+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
210+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
211+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
212+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
208213
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
209214
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
215+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess'
210216
)
211217

212218
ignoreMissingClasses(
@@ -320,10 +326,9 @@ tasks.named("thirdPartyAudit").configure {
320326
'com.aayushatharva.brotli4j.encoder.BrotliEncoderChannel',
321327
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
322328
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
323-
'com.github.luben.zstd.BaseZstdBufferDecompressingStreamNoFinalizer',
324329
'com.github.luben.zstd.Zstd',
325-
'com.github.luben.zstd.ZstdBufferDecompressingStreamNoFinalizer',
326-
'com.github.luben.zstd.ZstdDirectBufferDecompressingStreamNoFinalizer',
330+
'com.github.luben.zstd.ZstdInputStreamNoFinalizer',
331+
'com.github.luben.zstd.util.Native',
327332
'com.google.appengine.api.urlfetch.URLFetchServiceFactory',
328333
'com.google.protobuf.nano.CodedOutputByteBufferNano',
329334
'com.google.protobuf.nano.MessageNano',

0 commit comments

Comments
 (0)