Skip to content

Commit 332a3c7

Browse files
authored
Upgrade Netty to 4.1.76.Final, Netty Tcnative, grpc and protobuf (#15212)
* Upgrade Netty to 4.1.76.Final and Netty Tcnative to 2.0.51.Final Fixes #14015 - release notes https://netty.io/news/2022/04/12/4-1-76-Final.html - contains fix for netty/netty#11695 * Upgrade grpc to 1.45.1 and protobuf to 3.19.2 - grpc < 1.45.1 is not compatible with Netty > 4.1.74.Final - grpc/grpc-java#9004
1 parent 83cd791 commit 332a3c7

File tree

4 files changed

+115
-79
lines changed

4 files changed

+115
-79
lines changed

buildtools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<dependency>
135135
<groupId>io.netty</groupId>
136136
<artifactId>netty-common</artifactId>
137-
<version>4.1.74.Final</version>
137+
<version>4.1.76.Final</version>
138138
<scope>test</scope>
139139
</dependency>
140140
</dependencies>

distribution/server/src/assemble/LICENSE.bin.txt

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -352,26 +352,31 @@ The Apache Software License, Version 2.0
352352
- org.apache.commons-commons-compress-1.21.jar
353353
- org.apache.commons-commons-lang3-3.11.jar
354354
* Netty
355-
- io.netty-netty-buffer-4.1.74.Final.jar
356-
- io.netty-netty-codec-4.1.74.Final.jar
357-
- io.netty-netty-codec-dns-4.1.74.Final.jar
358-
- io.netty-netty-codec-http-4.1.74.Final.jar
359-
- io.netty-netty-codec-http2-4.1.74.Final.jar
360-
- io.netty-netty-codec-socks-4.1.74.Final.jar
361-
- io.netty-netty-codec-haproxy-4.1.74.Final.jar
362-
- io.netty-netty-common-4.1.74.Final.jar
363-
- io.netty-netty-handler-4.1.74.Final.jar
364-
- io.netty-netty-handler-proxy-4.1.74.Final.jar
365-
- io.netty-netty-resolver-4.1.74.Final.jar
366-
- io.netty-netty-resolver-dns-4.1.74.Final.jar
367-
- io.netty-netty-transport-4.1.74.Final.jar
368-
- io.netty-netty-transport-classes-epoll-4.1.74.Final.jar
369-
- io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
370-
- io.netty-netty-transport-native-epoll-4.1.74.Final.jar
371-
- io.netty-netty-transport-native-unix-common-4.1.74.Final.jar
372-
- io.netty-netty-transport-native-unix-common-4.1.74.Final-linux-x86_64.jar
373-
- io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar
374-
- io.netty-netty-tcnative-classes-2.0.48.Final.jar
355+
- io.netty-netty-buffer-4.1.76.Final.jar
356+
- io.netty-netty-codec-4.1.76.Final.jar
357+
- io.netty-netty-codec-dns-4.1.76.Final.jar
358+
- io.netty-netty-codec-http-4.1.76.Final.jar
359+
- io.netty-netty-codec-http2-4.1.76.Final.jar
360+
- io.netty-netty-codec-socks-4.1.76.Final.jar
361+
- io.netty-netty-codec-haproxy-4.1.76.Final.jar
362+
- io.netty-netty-common-4.1.76.Final.jar
363+
- io.netty-netty-handler-4.1.76.Final.jar
364+
- io.netty-netty-handler-proxy-4.1.76.Final.jar
365+
- io.netty-netty-resolver-4.1.76.Final.jar
366+
- io.netty-netty-resolver-dns-4.1.76.Final.jar
367+
- io.netty-netty-transport-4.1.76.Final.jar
368+
- io.netty-netty-transport-classes-epoll-4.1.76.Final.jar
369+
- io.netty-netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar
370+
- io.netty-netty-transport-native-epoll-4.1.76.Final.jar
371+
- io.netty-netty-transport-native-unix-common-4.1.76.Final.jar
372+
- io.netty-netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar
373+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final.jar
374+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar
375+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar
376+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar
377+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar
378+
- io.netty-netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar
379+
- io.netty-netty-tcnative-classes-2.0.51.Final.jar
375380
* Prometheus client
376381
- io.prometheus-simpleclient-0.5.0.jar
377382
- io.prometheus-simpleclient_common-0.5.0.jar
@@ -461,27 +466,27 @@ The Apache Software License, Version 2.0
461466
- org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.4.32.jar
462467
- org.jetbrains-annotations-13.0.jar
463468
* gRPC
464-
- io.grpc-grpc-all-1.42.1.jar
465-
- io.grpc-grpc-auth-1.42.1.jar
466-
- io.grpc-grpc-context-1.42.1.jar
467-
- io.grpc-grpc-core-1.42.1.jar
468-
- io.grpc-grpc-netty-1.42.1.jar
469-
- io.grpc-grpc-protobuf-1.42.1.jar
470-
- io.grpc-grpc-protobuf-lite-1.42.1.jar
471-
- io.grpc-grpc-stub-1.42.1.jar
472-
- io.grpc-grpc-alts-1.42.1.jar
473-
- io.grpc-grpc-api-1.42.1.jar
474-
- io.grpc-grpc-grpclb-1.42.1.jar
475-
- io.grpc-grpc-netty-shaded-1.42.1.jar
476-
- io.grpc-grpc-services-1.42.1.jar
477-
- io.grpc-grpc-xds-1.42.1.jar
478-
- io.grpc-grpc-rls-1.42.1.jar
469+
- io.grpc-grpc-all-1.45.1.jar
470+
- io.grpc-grpc-auth-1.45.1.jar
471+
- io.grpc-grpc-context-1.45.1.jar
472+
- io.grpc-grpc-core-1.45.1.jar
473+
- io.grpc-grpc-netty-1.45.1.jar
474+
- io.grpc-grpc-protobuf-1.45.1.jar
475+
- io.grpc-grpc-protobuf-lite-1.45.1.jar
476+
- io.grpc-grpc-stub-1.45.1.jar
477+
- io.grpc-grpc-alts-1.45.1.jar
478+
- io.grpc-grpc-api-1.45.1.jar
479+
- io.grpc-grpc-grpclb-1.45.1.jar
480+
- io.grpc-grpc-netty-shaded-1.45.1.jar
481+
- io.grpc-grpc-services-1.45.1.jar
482+
- io.grpc-grpc-xds-1.45.1.jar
483+
- io.grpc-grpc-rls-1.45.1.jar
479484
- com.google.auto.service-auto-service-annotations-1.0.jar
480485
* Perfmark
481486
- io.perfmark-perfmark-api-0.19.0.jar
482487
* OpenCensus
483-
- io.opencensus-opencensus-api-0.18.0.jar
484-
- io.opencensus-opencensus-contrib-http-util-0.24.0.jar
488+
- io.opencensus-opencensus-api-0.28.0.jar
489+
- io.opencensus-opencensus-contrib-http-util-0.28.0.jar
485490
- io.opencensus-opencensus-proto-0.2.0.jar
486491
* Jodah
487492
- net.jodah-typetools-0.5.0.jar
@@ -524,9 +529,10 @@ The Apache Software License, Version 2.0
524529
* Snappy Java
525530
- org.xerial.snappy-snappy-java-1.1.7.jar
526531
* Google HTTP Client
527-
- com.google.http-client-google-http-client-jackson2-1.38.0.jar
528-
- com.google.http-client-google-http-client-1.38.0.jar
529-
- com.google.auto.value-auto-value-annotations-1.7.4.jar
532+
- com.google.http-client-google-http-client-jackson2-1.41.0.jar
533+
- com.google.http-client-google-http-client-gson-1.41.0.jar
534+
- com.google.http-client-google-http-client-1.41.0.jar
535+
- com.google.auto.value-auto-value-annotations-1.9.jar
530536
- com.google.re2j-re2j-1.5.jar
531537
* Jetcd
532538
- io.etcd-jetcd-common-0.5.11.jar
@@ -536,8 +542,8 @@ The Apache Software License, Version 2.0
536542

537543
BSD 3-clause "New" or "Revised" License
538544
* Google auth library
539-
- com.google.auth-google-auth-library-credentials-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt
540-
- com.google.auth-google-auth-library-oauth2-http-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt
545+
- com.google.auth-google-auth-library-credentials-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt
546+
- com.google.auth-google-auth-library-oauth2-http-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt
541547
* LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt
542548
* JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt
543549
* JLine -- jline-jline-2.14.6.jar -- licenses/LICENSE-JLine.txt
@@ -556,8 +562,8 @@ MIT License
556562

557563
Protocol Buffers License
558564
* Protocol Buffers
559-
- com.google.protobuf-protobuf-java-3.16.1.jar -- licenses/LICENSE-protobuf.txt
560-
- com.google.protobuf-protobuf-java-util-3.16.1.jar -- licenses/LICENSE-protobuf.txt
565+
- com.google.protobuf-protobuf-java-3.19.2.jar -- licenses/LICENSE-protobuf.txt
566+
- com.google.protobuf-protobuf-java-util-3.19.2.jar -- licenses/LICENSE-protobuf.txt
561567

562568
CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
563569
* Java Annotations API

pom.xml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ flexible messaging model and an intuitive client API.</description>
110110
<snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
111111
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
112112
<curator.version>5.1.0</curator.version>
113-
<netty.version>4.1.74.Final</netty.version>
114-
<netty-tc-native.version>2.0.48.Final</netty-tc-native.version>
113+
<netty.version>4.1.76.Final</netty.version>
114+
<netty-tc-native.version>2.0.51.Final</netty-tc-native.version>
115115
<jetty.version>9.4.44.v20210927</jetty.version>
116116
<conscrypt.version>2.5.2</conscrypt.version>
117117
<jersey.version>2.34</jersey.version>
@@ -131,9 +131,10 @@ flexible messaging model and an intuitive client API.</description>
131131
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
132132
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
133133
<typetools.version>0.5.0</typetools.version>
134-
<protobuf3.version>3.16.1</protobuf3.version>
134+
<protobuf3.version>3.19.2</protobuf3.version>
135135
<protoc3.version>${protobuf3.version}</protoc3.version>
136-
<grpc.version>1.42.1</grpc.version>
136+
<grpc.version>1.45.1</grpc.version>
137+
<google-http-client.version>1.41.0</google-http-client.version>
137138
<perfmark.version>0.19.0</perfmark.version>
138139
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
139140
<gson.version>2.8.9</gson.version>
@@ -165,7 +166,7 @@ flexible messaging model and an intuitive client API.</description>
165166
<debezium.postgresql.version>42.3.3</debezium.postgresql.version>
166167
<debezium.mysql.version>8.0.28</debezium.mysql.version>
167168
<jsonwebtoken.version>0.11.1</jsonwebtoken.version>
168-
<opencensus.version>0.18.0</opencensus.version>
169+
<opencensus.version>0.28.0</opencensus.version>
169170
<hbase.version>2.4.9</hbase.version>
170171
<guava.version>31.0.1-jre</guava.version>
171172
<jcip.version>1.0</jcip.version>
@@ -1004,6 +1005,24 @@ flexible messaging model and an intuitive client API.</description>
10041005
<version>${grpc.version}</version>
10051006
</dependency>
10061007

1008+
<dependency>
1009+
<groupId>com.google.http-client</groupId>
1010+
<artifactId>google-http-client</artifactId>
1011+
<version>${google-http-client.version}</version>
1012+
</dependency>
1013+
1014+
<dependency>
1015+
<groupId>com.google.http-client</groupId>
1016+
<artifactId>google-http-client-jackson2</artifactId>
1017+
<version>${google-http-client.version}</version>
1018+
</dependency>
1019+
1020+
<dependency>
1021+
<groupId>com.google.http-client</groupId>
1022+
<artifactId>google-http-client-gson</artifactId>
1023+
<version>${google-http-client.version}</version>
1024+
</dependency>
1025+
10071026
<dependency>
10081027
<groupId>io.grpc</groupId>
10091028
<artifactId>grpc-netty-shaded</artifactId>
@@ -1160,6 +1179,12 @@ flexible messaging model and an intuitive client API.</description>
11601179
<version>${opencensus.version}</version>
11611180
</dependency>
11621181

1182+
<dependency>
1183+
<groupId>io.opencensus</groupId>
1184+
<artifactId>opencensus-contrib-http-util</artifactId>
1185+
<version>${opencensus.version}</version>
1186+
</dependency>
1187+
11631188
<dependency>
11641189
<groupId>io.opencensus</groupId>
11651190
<artifactId>opencensus-contrib-grpc-metrics</artifactId>

pulsar-sql/presto-distribution/LICENSE

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -232,35 +232,40 @@ The Apache Software License, Version 2.0
232232
- commons-lang3-3.11.jar
233233
* Netty
234234
- netty-3.10.6.Final.jar
235-
- netty-buffer-4.1.74.Final.jar
236-
- netty-codec-4.1.74.Final.jar
237-
- netty-codec-dns-4.1.74.Final.jar
238-
- netty-codec-http-4.1.74.Final.jar
239-
- netty-codec-haproxy-4.1.74.Final.jar
240-
- netty-codec-socks-4.1.74.Final.jar
241-
- netty-handler-proxy-4.1.74.Final.jar
242-
- netty-common-4.1.74.Final.jar
243-
- netty-handler-4.1.74.Final.jar
235+
- netty-buffer-4.1.76.Final.jar
236+
- netty-codec-4.1.76.Final.jar
237+
- netty-codec-dns-4.1.76.Final.jar
238+
- netty-codec-http-4.1.76.Final.jar
239+
- netty-codec-haproxy-4.1.76.Final.jar
240+
- netty-codec-socks-4.1.76.Final.jar
241+
- netty-handler-proxy-4.1.76.Final.jar
242+
- netty-common-4.1.76.Final.jar
243+
- netty-handler-4.1.76.Final.jar
244244
- netty-reactive-streams-2.0.4.jar
245-
- netty-resolver-4.1.74.Final.jar
246-
- netty-resolver-dns-4.1.74.Final.jar
247-
- netty-tcnative-boringssl-static-2.0.48.Final.jar
248-
- netty-tcnative-classes-2.0.48.Final.jar
249-
- netty-transport-4.1.74.Final.jar
250-
- netty-transport-classes-epoll-4.1.74.Final.jar
251-
- netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar
252-
- netty-transport-native-unix-common-4.1.74.Final.jar
253-
- netty-transport-native-unix-common-4.1.74.Final-linux-x86_64.jar
254-
- netty-codec-http2-4.1.74.Final.jar
245+
- netty-resolver-4.1.76.Final.jar
246+
- netty-resolver-dns-4.1.76.Final.jar
247+
- netty-tcnative-boringssl-static-2.0.51.Final.jar
248+
- netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar
249+
- netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar
250+
- netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar
251+
- netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar
252+
- netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar
253+
- netty-tcnative-classes-2.0.51.Final.jar
254+
- netty-transport-4.1.76.Final.jar
255+
- netty-transport-classes-epoll-4.1.76.Final.jar
256+
- netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar
257+
- netty-transport-native-unix-common-4.1.76.Final.jar
258+
- netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar
259+
- netty-codec-http2-4.1.76.Final.jar
255260
* GRPC
256-
- grpc-api-1.42.1.jar
257-
- grpc-context-1.42.1.jar
258-
- grpc-core-1.42.1.jar
259-
- grpc-grpclb-1.42.1.jar
260-
- grpc-netty-1.42.1.jar
261-
- grpc-protobuf-1.42.1.jar
262-
- grpc-protobuf-lite-1.42.1.jar
263-
- grpc-stub-1.42.1.jar
261+
- grpc-api-1.45.1.jar
262+
- grpc-context-1.45.1.jar
263+
- grpc-core-1.45.1.jar
264+
- grpc-grpclb-1.45.1.jar
265+
- grpc-netty-1.45.1.jar
266+
- grpc-protobuf-1.45.1.jar
267+
- grpc-protobuf-lite-1.45.1.jar
268+
- grpc-stub-1.45.1.jar
264269
* JEtcd
265270
- jetcd-common-0.5.11.jar
266271
- jetcd-core-0.5.11.jar
@@ -478,8 +483,8 @@ The Apache Software License, Version 2.0
478483

479484
Protocol Buffers License
480485
* Protocol Buffers
481-
- protobuf-java-3.16.1.jar
482-
- protobuf-java-util-3.16.1.jar
486+
- protobuf-java-3.19.2.jar
487+
- protobuf-java-util-3.19.2.jar
483488
- proto-google-common-protos-2.0.1.jar
484489

485490
BSD 3-clause "New" or "Revised" License

0 commit comments

Comments
 (0)