Skip to content

Commit 2a3d71b

Browse files
kingherckingherc
authored
Upgrade Netty to 4.1.94.Final (#97114)
Backport of #97112
1 parent 68092d0 commit 2a3d71b

File tree

6 files changed

+62
-45
lines changed

6 files changed

+62
-45
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ slf4j = 1.6.2
1717

1818
jna = 5.10.0
1919

20-
netty = 4.1.89.Final
20+
netty = 4.1.94.Final
2121
joda = 2.10.10
2222

2323
commons_lang3 = 3.9

‎docs/changelog/97114.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 97114
2+
summary: Upgrade Netty to 4.1.94.Final
3+
area: Network
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,9 +1374,9 @@
13741374
<sha256 value="63b1346bf9c97ac3c78db84ce4ffe32a69782724d337db7849cefe4e53330f21" origin="Generated by Gradle"/>
13751375
</artifact>
13761376
</component>
1377-
<component group="io.netty" name="netty-buffer" version="4.1.89.Final">
1378-
<artifact name="netty-buffer-4.1.89.Final.jar">
1379-
<sha256 value="753b5d9df75d1bb927acc0e1ac08c65cce9a9117f85db8f87d041fd3a2d5ebcf" origin="Generated by Gradle"/>
1377+
<component group="io.netty" name="netty-buffer" version="4.1.94.Final">
1378+
<artifact name="netty-buffer-4.1.94.Final.jar">
1379+
<sha256 value="8066ee7c49f9f29da96ee62f7cb13bee022cb4b68e51437b33da3b6d01398f13" origin="Generated by Gradle"/>
13801380
</artifact>
13811381
</component>
13821382
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
@@ -1389,49 +1389,49 @@
13891389
<sha256 value="de3239f3a8d5bdbc8c5049e00d0ab5415d1ccede30cb4e322694e8ffe3e354b5" origin="Generated by Gradle"/>
13901390
</artifact>
13911391
</component>
1392-
<component group="io.netty" name="netty-codec" version="4.1.89.Final">
1393-
<artifact name="netty-codec-4.1.89.Final.jar">
1394-
<sha256 value="fa6f2789b724ccbd0a734a88d9b6cdc25d592d8c22208ec35a7f4c4eda3714c7" origin="Generated by Gradle"/>
1392+
<component group="io.netty" name="netty-codec" version="4.1.94.Final">
1393+
<artifact name="netty-codec-4.1.94.Final.jar">
1394+
<sha256 value="91243776ad68b4d8e39eafb9ec115e1b8fa9aecd147b12ef15bb691639498328" origin="Generated by Gradle"/>
13951395
</artifact>
13961396
</component>
13971397
<component group="io.netty" name="netty-codec-dns" version="4.1.53.Final">
13981398
<artifact name="netty-codec-dns-4.1.53.Final.jar">
13991399
<sha256 value="747098d17592d092afdfd8c746e099c3b739986461ebcfa68d782f4b5b19b8ae" origin="Generated by Gradle"/>
14001400
</artifact>
14011401
</component>
1402-
<component group="io.netty" name="netty-codec-dns" version="4.1.89.Final">
1403-
<artifact name="netty-codec-dns-4.1.89.Final.jar">
1404-
<sha256 value="a71281ad6753fe7644587b7fd1013c87dcd0798b7fc0f4c41866d068be5ec3e0" origin="Generated by Gradle"/>
1402+
<component group="io.netty" name="netty-codec-dns" version="4.1.94.Final">
1403+
<artifact name="netty-codec-dns-4.1.94.Final.jar">
1404+
<sha256 value="b345048b7692204803b49eb11f5203b52e18aa7647f8b77dd63118fd8d5fd2a2" origin="Generated by Gradle"/>
14051405
</artifact>
14061406
</component>
14071407
<component group="io.netty" name="netty-codec-http" version="4.1.53.Final">
14081408
<artifact name="netty-codec-http-4.1.53.Final.jar">
14091409
<sha256 value="48a81eec058871c4eaf66670f824a76f403579c53ac7a6840dd6ace9dfc4ad4e" origin="Generated by Gradle"/>
14101410
</artifact>
14111411
</component>
1412-
<component group="io.netty" name="netty-codec-http" version="4.1.89.Final">
1413-
<artifact name="netty-codec-http-4.1.89.Final.jar">
1414-
<sha256 value="433e9fe8f1907847132f5bd022a7e6148ade6c834aef761765d7db4962cd6bb0" origin="Generated by Gradle"/>
1412+
<component group="io.netty" name="netty-codec-http" version="4.1.94.Final">
1413+
<artifact name="netty-codec-http-4.1.94.Final.jar">
1414+
<sha256 value="1ada4580f68cd17a534fb3c0337087073223a76cb77304dbe5a1b19df3d53c2f" origin="Generated by Gradle"/>
14151415
</artifact>
14161416
</component>
14171417
<component group="io.netty" name="netty-codec-http2" version="4.1.53.Final">
14181418
<artifact name="netty-codec-http2-4.1.53.Final.jar">
14191419
<sha256 value="6c777f308be5bb53f33925e695dc97f0b88688e2f1937c2c7a3975e977362df4" origin="Generated by Gradle"/>
14201420
</artifact>
14211421
</component>
1422-
<component group="io.netty" name="netty-codec-http2" version="4.1.89.Final">
1423-
<artifact name="netty-codec-http2-4.1.89.Final.jar">
1424-
<sha256 value="13bad47c625b0c7bb47315afe9a558c39b6f2c337c8bb18b8f5fd527e23ca798" origin="Generated by Gradle"/>
1422+
<component group="io.netty" name="netty-codec-http2" version="4.1.94.Final">
1423+
<artifact name="netty-codec-http2-4.1.94.Final.jar">
1424+
<sha256 value="8fbd2e95abec6155b60ed3c9c1600ed4e17ffe3f053cd5a40677d879c0af961f" origin="Generated by Gradle"/>
14251425
</artifact>
14261426
</component>
14271427
<component group="io.netty" name="netty-codec-socks" version="4.1.53.Final">
14281428
<artifact name="netty-codec-socks-4.1.53.Final.jar">
14291429
<sha256 value="8de51d13f48da8eece7df43aa00d6d2923a215668526d8888879fa1534e9aafe" origin="Generated by Gradle"/>
14301430
</artifact>
14311431
</component>
1432-
<component group="io.netty" name="netty-codec-socks" version="4.1.89.Final">
1433-
<artifact name="netty-codec-socks-4.1.89.Final.jar">
1434-
<sha256 value="8a46576f4d80935d91a9adedae9f7643c72c0d435a70e7ad51a6f1d0ba10df61" origin="Generated by Gradle"/>
1432+
<component group="io.netty" name="netty-codec-socks" version="4.1.94.Final">
1433+
<artifact name="netty-codec-socks-4.1.94.Final.jar">
1434+
<sha256 value="1c0b4ee0b623402dd5bb78fd4a69bf808da2510524f489a24b0f3cc58ded046e" origin="Generated by Gradle"/>
14351435
</artifact>
14361436
</component>
14371437
<component group="io.netty" name="netty-common" version="4.1.42.Final">
@@ -1444,9 +1444,9 @@
14441444
<sha256 value="0fc9d8ac53dcafa7823498cf668839d3fa164ea2e02eee5946c5f5061f61a5d9" origin="Generated by Gradle"/>
14451445
</artifact>
14461446
</component>
1447-
<component group="io.netty" name="netty-common" version="4.1.89.Final">
1448-
<artifact name="netty-common-4.1.89.Final.jar">
1449-
<sha256 value="36f1b610d99928fd11a2aa13e01fef8be03e6411e7acd4ca2273efa7f703e474" origin="Generated by Gradle"/>
1447+
<component group="io.netty" name="netty-common" version="4.1.94.Final">
1448+
<artifact name="netty-common-4.1.94.Final.jar">
1449+
<sha256 value="cb8d84a3e63aea90d0d7a333a02e50ac751d2b05db55745d981b5eff893f647b" origin="Generated by Gradle"/>
14501450
</artifact>
14511451
</component>
14521452
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
@@ -1459,19 +1459,19 @@
14591459
<sha256 value="6b5bc48c787af3d14be2387d2b180bc0f50e7dce7a7eb3afa7e3dd00c68f37e3" origin="Generated by Gradle"/>
14601460
</artifact>
14611461
</component>
1462-
<component group="io.netty" name="netty-handler" version="4.1.89.Final">
1463-
<artifact name="netty-handler-4.1.89.Final.jar">
1464-
<sha256 value="925a45ba01e3dcba1d40b8b595a3c8e8e885be491958279046087d643c9009ab" origin="Generated by Gradle"/>
1462+
<component group="io.netty" name="netty-handler" version="4.1.94.Final">
1463+
<artifact name="netty-handler-4.1.94.Final.jar">
1464+
<sha256 value="8e50719a9ab89e33ef85c5f36d780e0d7056b3f768b07d261d87baed7094eb3c" origin="Generated by Gradle"/>
14651465
</artifact>
14661466
</component>
14671467
<component group="io.netty" name="netty-handler-proxy" version="4.1.53.Final">
14681468
<artifact name="netty-handler-proxy-4.1.53.Final.jar">
14691469
<sha256 value="1f4b5a540f596e45bcde7c53f4c02780aa5e56eea4103eee78b7d104f90c97b1" origin="Generated by Gradle"/>
14701470
</artifact>
14711471
</component>
1472-
<component group="io.netty" name="netty-handler-proxy" version="4.1.89.Final">
1473-
<artifact name="netty-handler-proxy-4.1.89.Final.jar">
1474-
<sha256 value="5682b798fd6edbe2c521f196143dfe28fc993038438726b5fff127c181a0e9be" origin="Generated by Gradle"/>
1472+
<component group="io.netty" name="netty-handler-proxy" version="4.1.94.Final">
1473+
<artifact name="netty-handler-proxy-4.1.94.Final.jar">
1474+
<sha256 value="378738bfeb84c81228ae5de209f964ca87849f9a720c916c77f7cba6494bb1ec" origin="Generated by Gradle"/>
14751475
</artifact>
14761476
</component>
14771477
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
@@ -1484,19 +1484,19 @@
14841484
<sha256 value="93a531bbaa6d3a0652cbc9f13c21ca6cab9d6160c7a6f47c9cf29a5f2c5d6489" origin="Generated by Gradle"/>
14851485
</artifact>
14861486
</component>
1487-
<component group="io.netty" name="netty-resolver" version="4.1.89.Final">
1488-
<artifact name="netty-resolver-4.1.89.Final.jar">
1489-
<sha256 value="ef0f127d14c4b8a86d55a9841b59e0edcf8c6974caceba8939e7149e01348233" origin="Generated by Gradle"/>
1487+
<component group="io.netty" name="netty-resolver" version="4.1.94.Final">
1488+
<artifact name="netty-resolver-4.1.94.Final.jar">
1489+
<sha256 value="bd26e9bc5e94e2d3974a93fdf921658eff4f033bfd4c5208607760ab54298617" origin="Generated by Gradle"/>
14901490
</artifact>
14911491
</component>
14921492
<component group="io.netty" name="netty-resolver-dns" version="4.1.53.Final">
14931493
<artifact name="netty-resolver-dns-4.1.53.Final.jar">
14941494
<sha256 value="bb63961902ce4a4724e80efde16a63b06f871a2cb2387eb90aa2c3663f17db90" origin="Generated by Gradle"/>
14951495
</artifact>
14961496
</component>
1497-
<component group="io.netty" name="netty-resolver-dns" version="4.1.89.Final">
1498-
<artifact name="netty-resolver-dns-4.1.89.Final.jar">
1499-
<sha256 value="17fe0d7abe9f1cf498cdaf21942a1975fff744432686b9b7eac82667258e63b2" origin="Generated by Gradle"/>
1497+
<component group="io.netty" name="netty-resolver-dns" version="4.1.94.Final">
1498+
<artifact name="netty-resolver-dns-4.1.94.Final.jar">
1499+
<sha256 value="d6a0871adbc47ce4b08ab7c23c6e32047bd197641f5f3fd35d165faed79a89e8" origin="Generated by Gradle"/>
15001500
</artifact>
15011501
</component>
15021502
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
@@ -1509,9 +1509,9 @@
15091509
<sha256 value="140ff7266eb56762b7bbb9220e82ee27ad1f2f1dc262abcec6d7137cfec5bd00" origin="Generated by Gradle"/>
15101510
</artifact>
15111511
</component>
1512-
<component group="io.netty" name="netty-transport" version="4.1.89.Final">
1513-
<artifact name="netty-transport-4.1.89.Final.jar">
1514-
<sha256 value="12647324c8b8046750921b72a8eec62db1f92b2e3e744822cfb63b23fa387b03" origin="Generated by Gradle"/>
1512+
<component group="io.netty" name="netty-transport" version="4.1.94.Final">
1513+
<artifact name="netty-transport-4.1.94.Final.jar">
1514+
<sha256 value="a75afa84ca35a50225991b39e6b6278186e612f7a2a0c0e981de523aaac516a4" origin="Generated by Gradle"/>
15151515
</artifact>
15161516
</component>
15171517
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
@@ -1534,9 +1534,9 @@
15341534
<sha256 value="e97306961515012c7ca0dda4f1374ee65d9eb913336b1bac44096231236ad1cf" origin="Generated by Gradle"/>
15351535
</artifact>
15361536
</component>
1537-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.89.Final">
1538-
<artifact name="netty-transport-native-unix-common-4.1.89.Final.jar">
1539-
<sha256 value="a80c721f1c43ea670f6ee738ec50bfbd2189d43512a37d7f44878c8dda23a197" origin="Generated by Gradle"/>
1537+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.94.Final">
1538+
<artifact name="netty-transport-native-unix-common-4.1.94.Final.jar">
1539+
<sha256 value="27d0dff1cd743190279becacfb372fe4d45b266edafad9f1c6c01b04d00280eb" origin="Generated by Gradle"/>
15401540
</artifact>
15411541
</component>
15421542
<component group="io.opencensus" name="opencensus-api" version="0.28.0">

‎modules/transport-netty4/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ tasks.named("thirdPartyAudit").configure {
9090
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
9191
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
9292
'com.aayushatharva.brotli4j.encoder.BrotliEncoderChannel',
93-
'com.aayushatharva.brotli4j.encoder.Encoder',
9493
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
9594
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
9695

@@ -212,7 +211,12 @@ tasks.named("thirdPartyAudit").configure {
212211
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
213212
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
214213
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
215-
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator'
214+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
215+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
216+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
217+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3',
218+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4',
219+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5'
216220
)
217221
}
218222

‎plugins/repository-azure/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ tasks.named("thirdPartyAudit").configure {
115115
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
116116
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
117117
'com.aayushatharva.brotli4j.encoder.BrotliEncoderChannel',
118-
'com.aayushatharva.brotli4j.encoder.Encoder',
119118
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
120119
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
121120

@@ -333,6 +332,11 @@ tasks.named("thirdPartyAudit").configure {
333332

334333
ignoreViolations(
335334
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
335+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
336+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
337+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3',
338+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4',
339+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5',
336340

337341
'io.netty.util.internal.PlatformDependent0',
338342
'io.netty.util.internal.PlatformDependent0$1',

‎plugins/transport-nio/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ tasks.named("thirdPartyAudit").configure {
4040
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
4141
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
4242
'com.aayushatharva.brotli4j.encoder.BrotliEncoderChannel',
43-
'com.aayushatharva.brotli4j.encoder.Encoder',
4443
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
4544
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
4645

@@ -162,7 +161,12 @@ tasks.named("thirdPartyAudit").configure {
162161
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
163162
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
164163

165-
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator'
164+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
165+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
166+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
167+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3',
168+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4',
169+
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5'
166170
)
167171
}
168172

0 commit comments

Comments
 (0)