Skip to content

Commit bf12157

Browse files
creamsoupcreamsoup
authored
build: bump netty to 4.1.48.Final, bump tcnative to 2.0.30.Final (#6845)
1 parent fc53747 commit bf12157

File tree

5 files changed

+42
-41
lines changed

5 files changed

+42
-41
lines changed

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
397397
1.22.x | 4.1.35.Final | 2.0.25.Final
398398
1.23.x-1.24.x | 4.1.38.Final | 2.0.25.Final
399399
1.25.x-1.27.x | 4.1.42.Final | 2.0.26.Final
400-
1.28.x- | 4.1.45.Final | 2.0.28.Final
400+
1.28.x | 4.1.45.Final | 2.0.28.Final
401+
1.29.x- | 4.1.48.Final | 2.0.30.Final
401402

402403
_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
403404

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ subprojects {
4646
protocPluginBaseName = 'protoc-gen-grpc-java'
4747
javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
4848

49-
nettyVersion = '4.1.45.Final'
49+
nettyVersion = '4.1.48.Final'
5050
guavaVersion = '28.2-android'
5151
googleauthVersion = '0.20.0'
5252
protobufVersion = '3.11.0'
@@ -165,7 +165,7 @@ subprojects {
165165
// SECURITY.md (multiple occurrences)
166166
// examples/example-tls/build.gradle
167167
// examples/example-tls/pom.xml
168-
netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.28.Final',
168+
netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.30.Final',
169169

170170
conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.2.1',
171171
re2j: 'com.google.re2j:re2j:1.2',

‎examples/example-tls/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ targetCompatibility = 1.7
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.29.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def nettyTcNativeVersion = '2.0.28.Final'
27+
def nettyTcNativeVersion = '2.0.30.Final'
2828
def protocVersion = '3.11.0'
2929

3030
dependencies {

‎examples/example-tls/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.29.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
1616
<protoc.version>3.11.0</protoc.version>
17-
<netty.tcnative.version>2.0.25.Final</netty.tcnative.version>
17+
<netty.tcnative.version>2.0.30.Final</netty.tcnative.version>
1818
<!-- required for jdk9 -->
1919
<maven.compiler.source>1.7</maven.compiler.source>
2020
<maven.compiler.target>1.7</maven.compiler.target>

‎repositories.bzl‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2424
"com.google.truth:truth:1.0.1",
2525
"com.squareup.okhttp:okhttp:2.7.4",
2626
"com.squareup.okio:okio:1.13.0",
27-
"io.netty:netty-buffer:4.1.45.Final",
28-
"io.netty:netty-codec-http2:4.1.45.Final",
29-
"io.netty:netty-codec-http:4.1.45.Final",
30-
"io.netty:netty-codec-socks:4.1.45.Final",
31-
"io.netty:netty-codec:4.1.45.Final",
32-
"io.netty:netty-common:4.1.45.Final",
33-
"io.netty:netty-handler-proxy:4.1.45.Final",
34-
"io.netty:netty-handler:4.1.45.Final",
35-
"io.netty:netty-resolver:4.1.45.Final",
36-
"io.netty:netty-tcnative-boringssl-static:2.0.28.Final",
37-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.45.Final",
38-
"io.netty:netty-transport:4.1.45.Final",
27+
"io.netty:netty-buffer:4.1.48.Final",
28+
"io.netty:netty-codec-http2:4.1.48.Final",
29+
"io.netty:netty-codec-http:4.1.48.Final",
30+
"io.netty:netty-codec-socks:4.1.48.Final",
31+
"io.netty:netty-codec:4.1.48.Final",
32+
"io.netty:netty-common:4.1.48.Final",
33+
"io.netty:netty-handler-proxy:4.1.48.Final",
34+
"io.netty:netty-handler:4.1.48.Final",
35+
"io.netty:netty-resolver:4.1.48.Final",
36+
"io.netty:netty-tcnative-boringssl-static:2.0.30.Final",
37+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.48.Final",
38+
"io.netty:netty-transport:4.1.48.Final",
3939
"io.opencensus:opencensus-api:0.24.0",
4040
"io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
4141
"io.perfmark:perfmark-api:0.19.0",
@@ -319,108 +319,108 @@ def io_grpc_grpc_proto():
319319
def io_netty_netty_buffer():
320320
jvm_maven_import_external(
321321
name = "io_netty_netty_buffer",
322-
artifact = "io.netty:netty-buffer:4.1.45.Final",
322+
artifact = "io.netty:netty-buffer:4.1.48.Final",
323323
server_urls = ["https://repo.maven.apache.org/maven2/"],
324-
artifact_sha256 = "8437b43e03c272093066837567e1b89019ef291f06f5ace1051017981d98d59f",
324+
artifact_sha256 = "7efc8f98224c703ef09a409e5ddffbe14f5b4b6f527d3836c1647b4d9eff8cec",
325325
licenses = ["notice"], # Apache 2.0
326326
)
327327

328328
def io_netty_netty_codec():
329329
jvm_maven_import_external(
330330
name = "io_netty_netty_codec",
331-
artifact = "io.netty:netty-codec:4.1.45.Final",
331+
artifact = "io.netty:netty-codec:4.1.48.Final",
332332
server_urls = ["https://repo.maven.apache.org/maven2/"],
333-
artifact_sha256 = "47e211ad8c4c2b809b6e04541d6c8e3893dea63918dabe93fa5cf63914ffc9cc",
333+
artifact_sha256 = "81b4c316163a591b4f74fd2dc23a3ea45359cb817d0a9c4fc7f37dc9edfdbea8",
334334
licenses = ["notice"], # Apache 2.0
335335
)
336336

337337
def io_netty_netty_codec_http():
338338
jvm_maven_import_external(
339339
name = "io_netty_netty_codec_http",
340-
artifact = "io.netty:netty-codec-http:4.1.45.Final",
340+
artifact = "io.netty:netty-codec-http:4.1.48.Final",
341341
server_urls = ["https://repo.maven.apache.org/maven2/"],
342-
artifact_sha256 = "db8d8bf478bd3ad723c3d23fdf1cbf62ab9d419a8636e17add3f82f51f8e0bc1",
342+
artifact_sha256 = "aa4b18070e7fc105f0c94a077605687bec48091274c8acc121116692c335edd0",
343343
licenses = ["notice"], # Apache 2.0
344344
)
345345

346346
def io_netty_netty_codec_http2():
347347
jvm_maven_import_external(
348348
name = "io_netty_netty_codec_http2",
349-
artifact = "io.netty:netty-codec-http2:4.1.45.Final",
349+
artifact = "io.netty:netty-codec-http2:4.1.48.Final",
350350
server_urls = ["https://repo.maven.apache.org/maven2/"],
351-
artifact_sha256 = "09f82454ec9d4203b569c6027e11dd2f265aeba4bec5f61cef71845547e61faa",
351+
artifact_sha256 = "359548f53cf8697ebdfa13a4700f1b9a5585573c64f2d3ed135a3197ebd51579",
352352
licenses = ["notice"], # Apache 2.0
353353
)
354354

355355
def io_netty_netty_codec_socks():
356356
jvm_maven_import_external(
357357
name = "io_netty_netty_codec_socks",
358-
artifact = "io.netty:netty-codec-socks:4.1.45.Final",
358+
artifact = "io.netty:netty-codec-socks:4.1.48.Final",
359359
server_urls = ["https://repo.maven.apache.org/maven2/"],
360-
artifact_sha256 = "f5aa6197d3df9009bbb889ada2b1ae09b23559ebe748030478652c05a5977a25",
360+
artifact_sha256 = "d0dd35f9ac6892a03bb0d38ea32e683993c4308a02de5756bb5a23ecb929f917",
361361
licenses = ["notice"], # Apache 2.0
362362
)
363363

364364
def io_netty_netty_common():
365365
jvm_maven_import_external(
366366
name = "io_netty_netty_common",
367-
artifact = "io.netty:netty-common:4.1.45.Final",
367+
artifact = "io.netty:netty-common:4.1.48.Final",
368368
server_urls = ["https://repo.maven.apache.org/maven2/"],
369-
artifact_sha256 = "6f3c61684cf8c0f09df7ebb5a19df29d5d9fc175ce68ae237993b91366ccc43e",
369+
artifact_sha256 = "e44a2369566fd1fa8a0f30b12e2801de8fb405b9d1fa3894a58b6262065a9916",
370370
licenses = ["notice"], # Apache 2.0
371371
)
372372

373373
def io_netty_netty_handler():
374374
jvm_maven_import_external(
375375
name = "io_netty_netty_handler",
376-
artifact = "io.netty:netty-handler:4.1.45.Final",
376+
artifact = "io.netty:netty-handler:4.1.48.Final",
377377
server_urls = ["https://repo.maven.apache.org/maven2/"],
378-
artifact_sha256 = "2ad6785ba22fb522dba8128a0599b3f5ee47c210dddb8d8ec678f7765ac406f0",
378+
artifact_sha256 = "757f83c7891ad2ebad209f02d8dbca0121e03f7062c2d4ec9d00eba1a0d403d5",
379379
licenses = ["notice"], # Apache 2.0
380380
)
381381

382382
def io_netty_netty_handler_proxy():
383383
jvm_maven_import_external(
384384
name = "io_netty_netty_handler_proxy",
385-
artifact = "io.netty:netty-handler-proxy:4.1.45.Final",
385+
artifact = "io.netty:netty-handler-proxy:4.1.48.Final",
386386
server_urls = ["https://repo.maven.apache.org/maven2/"],
387-
artifact_sha256 = "410fc065171e26bb9a24ed5f7f88b3200e641cb65605ec11bc9c7625da28429a",
387+
artifact_sha256 = "f784f331bdb05834390c132d1534724e5371c1a19c7a62217e5f192963a9a92c",
388388
licenses = ["notice"], # Apache 2.0
389389
)
390390

391391
def io_netty_netty_resolver():
392392
jvm_maven_import_external(
393393
name = "io_netty_netty_resolver",
394-
artifact = "io.netty:netty-resolver:4.1.45.Final",
394+
artifact = "io.netty:netty-resolver:4.1.48.Final",
395395
server_urls = ["https://repo.maven.apache.org/maven2/"],
396-
artifact_sha256 = "1d762ecfa9da9241db339b611fad0529491bb0c3098c16e9c80d64f04d80323c",
396+
artifact_sha256 = "fb125914398ebef821def3dbb1642f9f360f39d182f00149ef3db845ebf06ad2",
397397
licenses = ["notice"], # Apache 2.0
398398
)
399399

400400
def io_netty_netty_tcnative_boringssl_static():
401401
jvm_maven_import_external(
402402
name = "io_netty_netty_tcnative_boringssl_static",
403-
artifact = "io.netty:netty-tcnative-boringssl-static:2.0.28.Final",
403+
artifact = "io.netty:netty-tcnative-boringssl-static:2.0.30.Final",
404404
server_urls = ["https://repo.maven.apache.org/maven2/"],
405-
artifact_sha256 = "2cf327d8185202804c998cc8ae9f493f483c5398c597d5385366c6fc9ad20aef",
405+
artifact_sha256 = "61934ca753be47973fe427d1f483a1b2fbcaf56eefc71519bf35fddb036ee111",
406406
licenses = ["notice"], # Apache 2.0
407407
)
408408

409409
def io_netty_netty_transport():
410410
jvm_maven_import_external(
411411
name = "io_netty_netty_transport",
412-
artifact = "io.netty:netty-transport:4.1.45.Final",
412+
artifact = "io.netty:netty-transport:4.1.48.Final",
413413
server_urls = ["https://repo.maven.apache.org/maven2/"],
414-
artifact_sha256 = "ca38fc85e9e18c4921d9ce92830445efad05d0fb3e8dd6ba3536e0843cdf723b",
414+
artifact_sha256 = "6b4ba9e09a8e060bad2540845491b5fa1ca73614d157860e657f4027c91e72fd",
415415
licenses = ["notice"], # Apache 2.0
416416
)
417417

418418
def io_netty_netty_transport_native_epoll_linux_x86_64():
419419
jvm_maven_import_external(
420420
name = "io_netty_netty_transport_native_epoll_linux_x86_64",
421-
artifact = "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.45.Final",
421+
artifact = "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.48.Final",
422422
server_urls = ["https://repo.maven.apache.org/maven2/"],
423-
artifact_sha256 = "3a9a5645177e20adef2fadb0feabba0d544e8f4403b2fc07353658717593af3e",
423+
artifact_sha256 = "7436ecfb442b299af6ecff7ae6a8d3f00fb56e081d20e82b467dad2e6ee8848f",
424424
licenses = ["notice"], # Apache 2.0
425425
)
426426

0 commit comments

Comments
 (0)