Skip to content

Commit ed9cd12

Browse files
joerg1985joerg1985
committed
[grid] update to netty 4.2.4
1 parent 5f276f0 commit ed9cd12

File tree

4 files changed

+200
-66
lines changed

4 files changed

+200
-66
lines changed

‎MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ maven.install(
234234
],
235235
boms = [
236236
"io.opentelemetry:opentelemetry-bom:1.53.0",
237-
"io.netty:netty-bom:4.1.121.Final",
237+
"io.netty:netty-bom:4.2.4.Final",
238238
"org.junit:junit-bom:5.13.4",
239239
],
240240
excluded_artifacts = [

‎java/maven_install.json

Lines changed: 126 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 773120019,
4-
"__RESOLVED_ARTIFACTS_HASH": -748858848,
3+
"__INPUT_ARTIFACTS_HASH": -438390700,
4+
"__RESOLVED_ARTIFACTS_HASH": 1853360225,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -242,94 +242,122 @@
242242
},
243243
"io.netty:netty-buffer": {
244244
"shasums": {
245-
"jar": "7d6ce32479f6f1326637ba118061bad31c3f7279f5fc2887aae8cba2526dcbff",
246-
"sources": "bf48a9e792d3e8a885ecd6047b456b4fb5c468da00a6a537582522a6df30ceba"
245+
"jar": "9e0dd42f1eabc58433962efa329acd372df305c30a6a58cd17feb1cd32f9e289",
246+
"sources": "46ccc0b286ac575b42ebfc6ccc58c02888996cfb090049484a78bd96375b0ea5"
247247
},
248-
"version": "4.1.121.Final"
248+
"version": "4.2.4.Final"
249249
},
250250
"io.netty:netty-codec": {
251251
"shasums": {
252-
"jar": "140f3a8d784aefd81700383471bd9220feb3438e5b1f441b6f80548529d9d516",
253-
"sources": "f17c838addf2b7da6e826eb92c6fdb1a4024efeb5ab19e59701329cc9d63933f"
252+
"jar": "86da6271c6d2ef06cf5e42a03bbc67a5f074f9778464f512f1c84c33fbfc89a9",
253+
"sources": "56f1adb200d60a4ee01785f00e271c37766d1c955536f54fa08ea475424d948e"
254254
},
255-
"version": "4.1.121.Final"
255+
"version": "4.2.4.Final"
256+
},
257+
"io.netty:netty-codec-base": {
258+
"shasums": {
259+
"jar": "0af2c137a8a3b264baf15887470d856a89bf712025a08652c3038bfffbfe6634",
260+
"sources": "01a4cfd4793e50153cc4826458120590f6f7321d72b6fe2231eb894140e2422d"
261+
},
262+
"version": "4.2.4.Final"
263+
},
264+
"io.netty:netty-codec-compression": {
265+
"shasums": {
266+
"jar": "63971c806632b08389c6d0b3c9d853dfef047618cd4cf555f23a992e155ce09c",
267+
"sources": "adba308c520c2b7c76b84d551add8b606355ac051ba4f2c631b2c5f07d917100"
268+
},
269+
"version": "4.2.4.Final"
256270
},
257271
"io.netty:netty-codec-dns": {
258272
"shasums": {
259-
"jar": "1652e3aa9508f5bfcb400ce72d6f7b824b68bc2a15e347285f9a88b008eef821",
260-
"sources": "e703097aaca60b51a44f1084a171f9f10a62dfb7dd831bf94d759f36c347adb4"
273+
"jar": "d5af43be74356efe87520478e6ab55132c9c023e96c99e1a438f3e5860cd5c9e",
274+
"sources": "0ac96df3a2d79b619e862e26525491b9364c201bbce9d82a82da1569fd63d69f"
261275
},
262-
"version": "4.1.121.Final"
276+
"version": "4.2.4.Final"
263277
},
264278
"io.netty:netty-codec-http": {
265279
"shasums": {
266-
"jar": "5dab40173bdf9219a7d9f3ae94acb0659d5c0e20ff6d5ffbd7b39a1268c31c1a",
267-
"sources": "ea12082b94cb758297fcc8e2a1f77aa06a0c6fefd7fa7e9c1ecefebbb7c1ef02"
280+
"jar": "bde689ddf294f70f105d0955cfc6d784d1e5ee4ea7730a733b1fc4728456d950",
281+
"sources": "bbba2b1424ab83003c0252bd3433d514d93a709390873e140f0fdb41f9cf1bda"
268282
},
269-
"version": "4.1.121.Final"
283+
"version": "4.2.4.Final"
270284
},
271285
"io.netty:netty-codec-http2": {
272286
"shasums": {
273-
"jar": "7513c0d74ae4c70b86b18fc7f25a2f97ae57b1cbdb38c5f6d547ea14d5ddecc7",
274-
"sources": "4efd24503ee3741a860c3d81b63fb04852477c18bbef4896293ac2389888fc0f"
287+
"jar": "89dc4fedb5c466d7ccdcc1193e4bb247a69b09042e7e4df994f3c4350d3102ee",
288+
"sources": "05db5f67340ece2fe86cffba2bd6555e212acc5e0572853b83dd95bff69587f8"
289+
},
290+
"version": "4.2.4.Final"
291+
},
292+
"io.netty:netty-codec-marshalling": {
293+
"shasums": {
294+
"jar": "2a3a8b1e631284fd2b538c11c9bd346c93ff16dc1c70bbab558dc8f24f1a4044",
295+
"sources": "ee6fec7b009c0fccdeacc33febe45973e9ccfa1ec342369c2f01bbfcb994ec5c"
296+
},
297+
"version": "4.2.4.Final"
298+
},
299+
"io.netty:netty-codec-protobuf": {
300+
"shasums": {
301+
"jar": "2318f521017dee8e0e4e50fd8d5e8a1b1d4762dcb69ea9aa52a7b79ff8c760bf",
302+
"sources": "61b817cbbf3dca1287fcc8b7525521561fefcdc94fa407f46b4ed4efcb9f9e98"
275303
},
276-
"version": "4.1.121.Final"
304+
"version": "4.2.4.Final"
277305
},
278306
"io.netty:netty-codec-socks": {
279307
"shasums": {
280-
"jar": "14ba49e5c4f56c62b1bd017f6b987df360a41093bbe9df340fc2e35b1c284b56",
281-
"sources": "7af26df3ccc18832690f6baca36fa0224042c1b9c14068038c2912150b45ce22"
308+
"jar": "d878e818f39b0d40bbfa942c7aaecea8cd62f14d3474e7b1e69a86dbea9d13cd",
309+
"sources": "1c2ff437576f46a6d6f14c2f066518994be2bcd8fe3295828cf06c4467f1eb0e"
282310
},
283-
"version": "4.1.121.Final"
311+
"version": "4.2.4.Final"
284312
},
285313
"io.netty:netty-common": {
286314
"shasums": {
287-
"jar": "58ddcad98fa2dbe69c9080e53e56e65cd50f61a3e45106b423cbad06b572a689",
288-
"sources": "b4e2d483da54fa6030d451c15c7035f8a38abde1e6c630692abfc799e601b317"
315+
"jar": "dd57448463662154c32e0cfa099960a16eda5f0896050e44195b0fc29863837f",
316+
"sources": "179d3073b473a446089083e5455904719f4ee145921c69023a883498b9d010bd"
289317
},
290-
"version": "4.1.121.Final"
318+
"version": "4.2.4.Final"
291319
},
292320
"io.netty:netty-handler": {
293321
"shasums": {
294-
"jar": "ddf550c1f3dfc4fcf2cbfca483474ac68941df2cce4cc3e5bddcbb15065c5169",
295-
"sources": "6ff5fb4f804ede12ebcf318ce458a3f71c9b3ee51023a3caa66711b9d7c40394"
322+
"jar": "5280b7ec84d494051ba99639c86793b04d924ea7ebdadac1528e66f4fe8392c8",
323+
"sources": "7ba3d1009cbf9aab7af8d773c1805d14d19b70cabebcae204aad2e44126813b3"
296324
},
297-
"version": "4.1.121.Final"
325+
"version": "4.2.4.Final"
298326
},
299327
"io.netty:netty-handler-proxy": {
300328
"shasums": {
301-
"jar": "2eb22bd8f0952ebd28503e01960c6ef96270dd3a7f0fa57b72ad0287ebdc238a",
302-
"sources": "0f56bdb43afabaf19968e57bcadd67f8f3be84e2d86bbd8cda14387c2bea1b2f"
329+
"jar": "14643a410912aae6314df96f80528ce4f89dfda1d2c7538bb3ee3f88de55a24f",
330+
"sources": "f5531ddfaddfa86271e938565a5508dd493e00bede7da1ab38c748d030a0aa30"
303331
},
304-
"version": "4.1.121.Final"
332+
"version": "4.2.4.Final"
305333
},
306334
"io.netty:netty-resolver": {
307335
"shasums": {
308-
"jar": "50ce227a5eb56e0b2e6b6c4e619de42350cbb9dff0728b906e3be8ad89158e87",
309-
"sources": "e783e2ff5161de56d16250e848d350f9d866a93ef41947864bef1dff2b21bcc7"
336+
"jar": "152b6531c0f9092b6a5c40c9ab709cfac275e433b4c080501740790d39863a0c",
337+
"sources": "b9bda1f6739d96e856cfde6725824d9ac185c586d713dcf0fbf0c78e1fbce6cb"
310338
},
311-
"version": "4.1.121.Final"
339+
"version": "4.2.4.Final"
312340
},
313341
"io.netty:netty-resolver-dns": {
314342
"shasums": {
315-
"jar": "25a09642d926a9f8d552e2667765b9a847bfcf266b897717c409884e174dffd3",
316-
"sources": "2072364b19db8804200ef3b8c6300a31f8becdcef85b12ed2b26ee8f84519646"
343+
"jar": "234325c9efa5f2583fc291d47d12168222abf9cadae7b54a560583ac3db08be1",
344+
"sources": "12b16163864ae8f55cac110a48faf94bdb81fa9a0cc6df26752815651e828a47"
317345
},
318-
"version": "4.1.121.Final"
346+
"version": "4.2.4.Final"
319347
},
320348
"io.netty:netty-transport": {
321349
"shasums": {
322-
"jar": "2dcc65e700858d3b080efb5a8af85a2de93d80b4616161fe031913fd840236ef",
323-
"sources": "f469be248924c6752962ea437881f4c7ff59ca120b7c1c1fc4b54f8356fb84f1"
350+
"jar": "c7873858bcf25d59211f99d3dd35a52d644efc5116cd0a00cd4402b3d23c6372",
351+
"sources": "01ccb80cb2c357aa6ee707074a7a1b75658cfe4fb5a6836587e3e1b6a1b3099d"
324352
},
325-
"version": "4.1.121.Final"
353+
"version": "4.2.4.Final"
326354
},
327355
"io.netty:netty-transport-native-unix-common": {
328356
"shasums": {
329-
"jar": "d8c368a320f5478e5745eee3525aca011219d61b848bc1c11e047ed18104bdea",
330-
"sources": "baad6b89d0dd1a9cb7f646966c9d69cdb448ab7ed656fd3533a9969615080600"
357+
"jar": "d2e4f5a147af8546f5250f1fa7d1bc08b0f28e15f0f3195c7f24ebb1862a43c1",
358+
"sources": "fb93ce5111649f8c9fded892448bb20f977f841fc10c52ad70a2fa1b09586f2e"
331359
},
332-
"version": "4.1.121.Final"
360+
"version": "4.2.4.Final"
333361
},
334362
"io.opentelemetry:opentelemetry-api": {
335363
"shasums": {
@@ -902,58 +930,87 @@
902930
],
903931
"io.netty:netty-codec": [
904932
"io.netty:netty-buffer",
933+
"io.netty:netty-codec-base",
934+
"io.netty:netty-codec-compression",
935+
"io.netty:netty-codec-marshalling",
936+
"io.netty:netty-codec-protobuf",
937+
"io.netty:netty-common",
938+
"io.netty:netty-transport"
939+
],
940+
"io.netty:netty-codec-base": [
941+
"io.netty:netty-buffer",
942+
"io.netty:netty-common",
943+
"io.netty:netty-transport"
944+
],
945+
"io.netty:netty-codec-compression": [
946+
"io.netty:netty-buffer",
947+
"io.netty:netty-codec-base",
905948
"io.netty:netty-common",
906949
"io.netty:netty-transport"
907950
],
908951
"io.netty:netty-codec-dns": [
909952
"io.netty:netty-buffer",
910-
"io.netty:netty-codec",
953+
"io.netty:netty-codec-base",
911954
"io.netty:netty-common",
912955
"io.netty:netty-transport"
913956
],
914957
"io.netty:netty-codec-http": [
915958
"io.netty:netty-buffer",
916-
"io.netty:netty-codec",
959+
"io.netty:netty-codec-base",
960+
"io.netty:netty-codec-compression",
917961
"io.netty:netty-common",
918962
"io.netty:netty-handler",
919963
"io.netty:netty-transport"
920964
],
921965
"io.netty:netty-codec-http2": [
922966
"io.netty:netty-buffer",
923-
"io.netty:netty-codec",
967+
"io.netty:netty-codec-base",
924968
"io.netty:netty-codec-http",
925969
"io.netty:netty-common",
926970
"io.netty:netty-handler",
927971
"io.netty:netty-transport"
928972
],
973+
"io.netty:netty-codec-marshalling": [
974+
"io.netty:netty-buffer",
975+
"io.netty:netty-codec-base",
976+
"io.netty:netty-common",
977+
"io.netty:netty-transport"
978+
],
979+
"io.netty:netty-codec-protobuf": [
980+
"io.netty:netty-buffer",
981+
"io.netty:netty-codec-base",
982+
"io.netty:netty-common",
983+
"io.netty:netty-transport"
984+
],
929985
"io.netty:netty-codec-socks": [
930986
"io.netty:netty-buffer",
931-
"io.netty:netty-codec",
987+
"io.netty:netty-codec-base",
932988
"io.netty:netty-common",
933989
"io.netty:netty-transport"
934990
],
935991
"io.netty:netty-handler": [
936992
"io.netty:netty-buffer",
937-
"io.netty:netty-codec",
993+
"io.netty:netty-codec-base",
938994
"io.netty:netty-common",
939995
"io.netty:netty-resolver",
940996
"io.netty:netty-transport",
941997
"io.netty:netty-transport-native-unix-common"
942998
],
943999
"io.netty:netty-handler-proxy": [
9441000
"io.netty:netty-buffer",
945-
"io.netty:netty-codec",
1001+
"io.netty:netty-codec-base",
9461002
"io.netty:netty-codec-http",
9471003
"io.netty:netty-codec-socks",
9481004
"io.netty:netty-common",
1005+
"io.netty:netty-handler",
9491006
"io.netty:netty-transport"
9501007
],
9511008
"io.netty:netty-resolver": [
9521009
"io.netty:netty-common"
9531010
],
9541011
"io.netty:netty-resolver-dns": [
9551012
"io.netty:netty-buffer",
956-
"io.netty:netty-codec",
1013+
"io.netty:netty-codec-base",
9571014
"io.netty:netty-codec-dns",
9581015
"io.netty:netty-common",
9591016
"io.netty:netty-handler",
@@ -1567,19 +1624,19 @@
15671624
],
15681625
"io.netty:netty-buffer": [
15691626
"io.netty.buffer",
1570-
"io.netty.buffer.search"
1627+
"io.netty.buffer.search",
1628+
"io.netty.buffer.svm"
15711629
],
1572-
"io.netty:netty-codec": [
1630+
"io.netty:netty-codec-base": [
15731631
"io.netty.handler.codec",
15741632
"io.netty.handler.codec.base64",
15751633
"io.netty.handler.codec.bytes",
1576-
"io.netty.handler.codec.compression",
15771634
"io.netty.handler.codec.json",
1578-
"io.netty.handler.codec.marshalling",
1579-
"io.netty.handler.codec.protobuf",
15801635
"io.netty.handler.codec.serialization",
1581-
"io.netty.handler.codec.string",
1582-
"io.netty.handler.codec.xml"
1636+
"io.netty.handler.codec.string"
1637+
],
1638+
"io.netty:netty-codec-compression": [
1639+
"io.netty.handler.codec.compression"
15831640
],
15841641
"io.netty:netty-codec-dns": [
15851642
"io.netty.handler.codec.dns"
@@ -1598,6 +1655,12 @@
15981655
"io.netty:netty-codec-http2": [
15991656
"io.netty.handler.codec.http2"
16001657
],
1658+
"io.netty:netty-codec-marshalling": [
1659+
"io.netty.handler.codec.marshalling"
1660+
],
1661+
"io.netty:netty-codec-protobuf": [
1662+
"io.netty.handler.codec.protobuf"
1663+
],
16011664
"io.netty:netty-codec-socks": [
16021665
"io.netty.handler.codec.socks",
16031666
"io.netty.handler.codec.socksx",
@@ -1627,7 +1690,6 @@
16271690
"io.netty.handler.logging",
16281691
"io.netty.handler.pcap",
16291692
"io.netty.handler.ssl",
1630-
"io.netty.handler.ssl.ocsp",
16311693
"io.netty.handler.ssl.util",
16321694
"io.netty.handler.stream",
16331695
"io.netty.handler.timeout",
@@ -2950,12 +3012,20 @@
29503012
"io.netty:netty-buffer",
29513013
"io.netty:netty-buffer:jar:sources",
29523014
"io.netty:netty-codec",
3015+
"io.netty:netty-codec-base",
3016+
"io.netty:netty-codec-base:jar:sources",
3017+
"io.netty:netty-codec-compression",
3018+
"io.netty:netty-codec-compression:jar:sources",
29533019
"io.netty:netty-codec-dns",
29543020
"io.netty:netty-codec-dns:jar:sources",
29553021
"io.netty:netty-codec-http",
29563022
"io.netty:netty-codec-http2",
29573023
"io.netty:netty-codec-http2:jar:sources",
29583024
"io.netty:netty-codec-http:jar:sources",
3025+
"io.netty:netty-codec-marshalling",
3026+
"io.netty:netty-codec-marshalling:jar:sources",
3027+
"io.netty:netty-codec-protobuf",
3028+
"io.netty:netty-codec-protobuf:jar:sources",
29593029
"io.netty:netty-codec-socks",
29603030
"io.netty:netty-codec-socks:jar:sources",
29613031
"io.netty:netty-codec:jar:sources",

‎java/src/org/openqa/selenium/netty/server/NettyServer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
import io.netty.bootstrap.ServerBootstrap;
2121
import io.netty.channel.Channel;
2222
import io.netty.channel.EventLoopGroup;
23-
import io.netty.channel.nio.NioEventLoopGroup;
23+
import io.netty.channel.MultiThreadIoEventLoopGroup;
24+
import io.netty.channel.nio.NioIoHandler;
2425
import io.netty.channel.socket.nio.NioServerSocketChannel;
2526
import io.netty.handler.logging.LogLevel;
2627
import io.netty.handler.logging.LoggingHandler;
@@ -99,8 +100,8 @@ public NettyServer(
99100

100101
this.handler = handler.with(new ErrorFilter().andThen(new AddWebDriverSpecHeaders()));
101102

102-
bossGroup = new NioEventLoopGroup(1);
103-
workerGroup = new NioEventLoopGroup();
103+
bossGroup = new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
104+
workerGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
104105

105106
port = options.getPort();
106107
host = options.getHostname().orElse("0.0.0.0");

0 commit comments

Comments
 (0)