Skip to content

Commit 2f86ec4

Browse files
jakelandisjakelandis
authored
[8.15] Bump Netty to 4.1.115.Final (#116696) (#116759)
* Bump Netty to 4.1.115.Final (#116696) This commit bumps Netty from 4.1.109.Final to 4.1.115.Final (cherry picked from commit b42dbab) # Conflicts: # gradle/verification-metadata.xml # x-pack/plugin/inference/build.gradle * fix merge issue
1 parent 777d774 commit 2f86ec4

File tree

3 files changed

+53
-43
lines changed

3 files changed

+53
-43
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: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,104 +1331,109 @@
13311331
<sha256 value="a3ebec96768ee4a2d3db44597e84cea2d0bdd68ca04822397980ea9f67075a86" origin="Generated by Gradle"/>
13321332
</artifact>
13331333
</component>
1334-
<component group="io.netty" name="netty-buffer" version="4.1.109.Final">
1335-
<artifact name="netty-buffer-4.1.109.Final.jar">
1336-
<sha256 value="ed49956c1e5d99534af2e9e9ecb80f4d3390c631c6cedd2a94d23aedcc911bb9" origin="Generated by Gradle"/>
1334+
<component group="io.netty" name="netty-buffer" version="4.1.115.Final">
1335+
<artifact name="netty-buffer-4.1.115.Final.jar">
1336+
<sha256 value="4a7b331d3770c566ab70eb02a0d1feed63b95cf6e4d68c8fe778c4c9de2d116d" origin="Generated by Gradle"/>
13371337
</artifact>
13381338
</component>
13391339
<component group="io.netty" name="netty-buffer" version="4.1.42.Final">
13401340
<artifact name="netty-buffer-4.1.42.Final.jar">
13411341
<sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
13421342
</artifact>
13431343
</component>
1344-
<component group="io.netty" name="netty-codec" version="4.1.109.Final">
1345-
<artifact name="netty-codec-4.1.109.Final.jar">
1346-
<sha256 value="2df943cd3ed24f86d61d442314e8a9a4c06b85a9a7aa99cec8c6520e77ff3f1c" origin="Generated by Gradle"/>
1344+
<component group="io.netty" name="netty-codec" version="4.1.115.Final">
1345+
<artifact name="netty-codec-4.1.115.Final.jar">
1346+
<sha256 value="cd189afb70ec6eacfcdfdd3a5f472b4e705a5c91d5bd3ef0386421f2ae15ec77" origin="Generated by Gradle"/>
13471347
</artifact>
13481348
</component>
13491349
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
13501350
<artifact name="netty-codec-4.1.42.Final.jar">
13511351
<sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
13521352
</artifact>
13531353
</component>
1354-
<component group="io.netty" name="netty-codec-dns" version="4.1.109.Final">
1355-
<artifact name="netty-codec-dns-4.1.109.Final.jar">
1356-
<sha256 value="a67a84c0a46094815e2044ac1314d8d81089d219ec8e8c732f9a12ba4cd451bd" origin="Generated by Gradle"/>
1354+
<component group="io.netty" name="netty-codec-dns" version="4.1.115.Final">
1355+
<artifact name="netty-codec-dns-4.1.115.Final.jar">
1356+
<sha256 value="23dd6806bcc326855f13e69838c6411d0490e6b1aeb12e217a19a3dd6ad3f10d" origin="Generated by Gradle"/>
13571357
</artifact>
13581358
</component>
1359-
<component group="io.netty" name="netty-codec-http" version="4.1.109.Final">
1360-
<artifact name="netty-codec-http-4.1.109.Final.jar">
1361-
<sha256 value="fdf056b08e156797d8f6caa727af0370dea8265b1eff8fc6f9e739c5c1f093d1" origin="Generated by Gradle"/>
1359+
<component group="io.netty" name="netty-codec-http" version="4.1.115.Final">
1360+
<artifact name="netty-codec-http-4.1.115.Final.jar">
1361+
<sha256 value="e6dbe971c59373bbae9802021c63b9bc1d8800fead382863d67e79e79b023166" origin="Generated by Gradle"/>
13621362
</artifact>
13631363
</component>
1364-
<component group="io.netty" name="netty-codec-http2" version="4.1.109.Final">
1365-
<artifact name="netty-codec-http2-4.1.109.Final.jar">
1366-
<sha256 value="a75498995087968b4582aefe42cfa8ca257759f32279edbec3c874e54acf633c" origin="Generated by Gradle"/>
1364+
<component group="io.netty" name="netty-codec-http2" version="4.1.115.Final">
1365+
<artifact name="netty-codec-http2-4.1.115.Final.jar">
1366+
<sha256 value="cbed9829a5d582e91e314e209edce9a0c2eb369f23bb4fb74a5bc8b7990222c2" origin="Generated by Gradle"/>
13671367
</artifact>
13681368
</component>
1369-
<component group="io.netty" name="netty-codec-socks" version="4.1.109.Final">
1370-
<artifact name="netty-codec-socks-4.1.109.Final.jar">
1371-
<sha256 value="a8b2c52807e4071f8fdd6239b8fd0c4d2cd282ebf08406f8d431d3229b69418e" origin="Generated by Gradle"/>
1369+
<component group="io.netty" name="netty-codec-socks" version="4.1.115.Final">
1370+
<artifact name="netty-codec-socks-4.1.115.Final.jar">
1371+
<sha256 value="e9b1cc744dc6195894450b1fd4d271a821ab167fe21ae3c459b27cdadc70e81f" origin="Generated by Gradle"/>
13721372
</artifact>
13731373
</component>
1374-
<component group="io.netty" name="netty-common" version="4.1.109.Final">
1375-
<artifact name="netty-common-4.1.109.Final.jar">
1376-
<sha256 value="33bf51077021de2b9d80b9ec64a4fae68f22e6ec56f52431441eaf6dd79cce71" origin="Generated by Gradle"/>
1374+
<component group="io.netty" name="netty-common" version="4.1.115.Final">
1375+
<artifact name="netty-common-4.1.115.Final.jar">
1376+
<sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
13771377
</artifact>
13781378
</component>
13791379
<component group="io.netty" name="netty-common" version="4.1.42.Final">
13801380
<artifact name="netty-common-4.1.42.Final.jar">
13811381
<sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
13821382
</artifact>
13831383
</component>
1384-
<component group="io.netty" name="netty-handler" version="4.1.109.Final">
1385-
<artifact name="netty-handler-4.1.109.Final.jar">
1386-
<sha256 value="1161e2ed8e1f037124a8ddfe3d4184ebaa7be17aea27e7fca87f510f17898ea5" origin="Generated by Gradle"/>
1384+
<component group="io.netty" name="netty-handler" version="4.1.115.Final">
1385+
<artifact name="netty-handler-4.1.115.Final.jar">
1386+
<sha256 value="5972028cc863b74927ce0d11fb8d58f65da2560bef5602fe8ce8903bd306ca07" origin="Generated by Gradle"/>
13871387
</artifact>
13881388
</component>
13891389
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
13901390
<artifact name="netty-handler-4.1.42.Final.jar">
13911391
<sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
13921392
</artifact>
13931393
</component>
1394-
<component group="io.netty" name="netty-handler-proxy" version="4.1.109.Final">
1395-
<artifact name="netty-handler-proxy-4.1.109.Final.jar">
1396-
<sha256 value="42e34c84423f074a4db4576e6d1ddabf56eb26705213e5f9b6ef537ce36bcd0b" origin="Generated by Gradle"/>
1394+
<component group="io.netty" name="netty-handler-proxy" version="4.1.115.Final">
1395+
<artifact name="netty-handler-proxy-4.1.115.Final.jar">
1396+
<sha256 value="807e67cfb17136927d11db42df62031169d1fa0883e13f254906994c84ffbe87" origin="Generated by Gradle"/>
13971397
</artifact>
13981398
</component>
1399-
<component group="io.netty" name="netty-resolver" version="4.1.109.Final">
1400-
<artifact name="netty-resolver-4.1.109.Final.jar">
1401-
<sha256 value="e168920249ea8d65076b0847e64464b5132843f1f1b2ff514e45fa255b64300b" origin="Generated by Gradle"/>
1399+
<component group="io.netty" name="netty-resolver" version="4.1.115.Final">
1400+
<artifact name="netty-resolver-4.1.115.Final.jar">
1401+
<sha256 value="7b3455d14f59828765a00573bc3967dc59379e874bd62a67eb1926d6512109d1" origin="Generated by Gradle"/>
14021402
</artifact>
14031403
</component>
14041404
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
14051405
<artifact name="netty-resolver-4.1.42.Final.jar">
14061406
<sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
14071407
</artifact>
14081408
</component>
1409-
<component group="io.netty" name="netty-resolver-dns" version="4.1.109.Final">
1410-
<artifact name="netty-resolver-dns-4.1.109.Final.jar">
1411-
<sha256 value="7e354a85f8147744aeb9d3e1e64ace18f6432a25c09f8bde57383959a842c967" origin="Generated by Gradle"/>
1409+
<component group="io.netty" name="netty-resolver-dns" version="4.1.115.Final">
1410+
<artifact name="netty-resolver-dns-4.1.115.Final.jar">
1411+
<sha256 value="4aca31593e5896c64ab7e041bbc6c0d851bd9634ec3a4354208141a35576619f" origin="Generated by Gradle"/>
14121412
</artifact>
14131413
</component>
1414-
<component group="io.netty" name="netty-transport" version="4.1.109.Final">
1415-
<artifact name="netty-transport-4.1.109.Final.jar">
1416-
<sha256 value="c1ac17ce337d945290be680d7be942b7b4ff4c989be8ec24c684b3e94438da52" origin="Generated by Gradle"/>
1414+
<component group="io.netty" name="netty-transport" version="4.1.115.Final">
1415+
<artifact name="netty-transport-4.1.115.Final.jar">
1416+
<sha256 value="c3d71faaa736ffd2c9260ab0b498024b814c39c7d764bea8113fa98de6e2bdd2" origin="Generated by Gradle"/>
14171417
</artifact>
14181418
</component>
14191419
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
14201420
<artifact name="netty-transport-4.1.42.Final.jar">
14211421
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
14221422
</artifact>
14231423
</component>
1424+
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.115.Final">
1425+
<artifact name="netty-transport-classes-epoll-4.1.115.Final.jar">
1426+
<sha256 value="40aa67b4463cca0ab346e393c87f6c37e8954d18ec8b78567d95b55aa1f2b3aa" origin="Generated by Gradle"/>
1427+
</artifact>
1428+
</component>
14241429
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
14251430
<artifact name="netty-transport-native-epoll-4.1.42.Final.jar">
14261431
<sha256 value="3c7d659b3bd773e0ea9b7517d2d6baffa275a3d2ae8eb4c10cb8f0a7724b11d5" origin="Generated by Gradle"/>
14271432
</artifact>
14281433
</component>
1429-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.109.Final">
1430-
<artifact name="netty-transport-native-unix-common-4.1.109.Final.jar">
1431-
<sha256 value="61e66832820f257bbee68722ec088b39da383c213eafbd1767097a7fff5d029f" origin="Generated by Gradle"/>
1434+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.115.Final">
1435+
<artifact name="netty-transport-native-unix-common-4.1.115.Final.jar">
1436+
<sha256 value="4b03e716272657c296b0204b57c140b2b2ca96b1a746c92da41f595892ec6d88" origin="Generated by Gradle"/>
14321437
</artifact>
14331438
</component>
14341439
<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
@@ -176,9 +176,8 @@ tasks.named("thirdPartyAudit").configure {
176176
'com.google.protobuf.nano.CodedOutputByteBufferNano',
177177
'com.google.protobuf.nano.MessageNano',
178178
'com.github.luben.zstd.Zstd',
179-
'com.github.luben.zstd.BaseZstdBufferDecompressingStreamNoFinalizer',
180-
'com.github.luben.zstd.ZstdBufferDecompressingStreamNoFinalizer',
181-
'com.github.luben.zstd.ZstdDirectBufferDecompressingStreamNoFinalizer',
179+
'com.github.luben.zstd.ZstdInputStreamNoFinalizer',
180+
'com.github.luben.zstd.util.Native',
182181
'com.jcraft.jzlib.Deflater',
183182
'com.jcraft.jzlib.Inflater',
184183
'com.jcraft.jzlib.JZlib$WrapperType',
@@ -230,8 +229,14 @@ tasks.named("thirdPartyAudit").configure {
230229
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
231230
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
232231
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
232+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
233+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
234+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
235+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
236+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
233237
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
234238
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
239+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
235240
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
236241
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
237242
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',

0 commit comments

Comments
 (0)