From a547163f32a1db59fc1a316f3b01b65056668764 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 19 Apr 2022 19:14:44 +0300 Subject: [PATCH] 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 https://github.com/netty/netty/issues/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 - https://github.com/grpc/grpc-java/pull/9004 (cherry picked from commit 332a3c74c03184bb8d1298450ff21e5dc93be375) --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 95 ++++++++++--------- pom.xml | 35 ++++++- pulsar-sql/presto-distribution/LICENSE | 52 ++++++---- 4 files changed, 116 insertions(+), 68 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 126d1b599a00f..b41e5d38c54fe 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -105,7 +105,7 @@ io.netty netty-common - 4.1.74.Final + 4.1.76.Final test diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 7e8f189dcc634..53197fb345b65 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -352,26 +352,31 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-compress-1.21.jar - org.apache.commons-commons-lang3-3.11.jar * Netty - - io.netty-netty-buffer-4.1.74.Final.jar - - io.netty-netty-codec-4.1.74.Final.jar - - io.netty-netty-codec-dns-4.1.74.Final.jar - - io.netty-netty-codec-http-4.1.74.Final.jar - - io.netty-netty-codec-http2-4.1.74.Final.jar - - io.netty-netty-codec-socks-4.1.74.Final.jar - - io.netty-netty-codec-haproxy-4.1.74.Final.jar - - io.netty-netty-common-4.1.74.Final.jar - - io.netty-netty-handler-4.1.74.Final.jar - - io.netty-netty-handler-proxy-4.1.74.Final.jar - - io.netty-netty-resolver-4.1.74.Final.jar - - io.netty-netty-resolver-dns-4.1.74.Final.jar - - io.netty-netty-transport-4.1.74.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.74.Final.jar - - io.netty-netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar - - io.netty-netty-transport-native-epoll-4.1.74.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.74.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.74.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.48.Final.jar - - io.netty-netty-tcnative-classes-2.0.48.Final.jar + - io.netty-netty-buffer-4.1.76.Final.jar + - io.netty-netty-codec-4.1.76.Final.jar + - io.netty-netty-codec-dns-4.1.76.Final.jar + - io.netty-netty-codec-http-4.1.76.Final.jar + - io.netty-netty-codec-http2-4.1.76.Final.jar + - io.netty-netty-codec-socks-4.1.76.Final.jar + - io.netty-netty-codec-haproxy-4.1.76.Final.jar + - io.netty-netty-common-4.1.76.Final.jar + - io.netty-netty-handler-4.1.76.Final.jar + - io.netty-netty-handler-proxy-4.1.76.Final.jar + - io.netty-netty-resolver-4.1.76.Final.jar + - io.netty-netty-resolver-dns-4.1.76.Final.jar + - io.netty-netty-transport-4.1.76.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.76.Final.jar + - io.netty-netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar + - io.netty-netty-transport-native-epoll-4.1.76.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.76.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar + - io.netty-netty-tcnative-classes-2.0.51.Final.jar * Prometheus client - io.prometheus-simpleclient-0.5.0.jar - io.prometheus-simpleclient_common-0.5.0.jar @@ -456,27 +461,26 @@ The Apache Software License, Version 2.0 * Okio - com.squareup.okio-okio-1.17.5.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * gRPC - - io.grpc-grpc-all-1.42.1.jar - - io.grpc-grpc-auth-1.42.1.jar - - io.grpc-grpc-context-1.42.1.jar - - io.grpc-grpc-core-1.42.1.jar - - io.grpc-grpc-netty-1.42.1.jar - - io.grpc-grpc-okhttp-1.42.1.jar - - io.grpc-grpc-protobuf-1.42.1.jar - - io.grpc-grpc-protobuf-lite-1.42.1.jar - - io.grpc-grpc-stub-1.42.1.jar - - io.grpc-grpc-alts-1.42.1.jar - - io.grpc-grpc-api-1.42.1.jar - - io.grpc-grpc-grpclb-1.42.1.jar - - io.grpc-grpc-netty-shaded-1.42.1.jar - - io.grpc-grpc-services-1.42.1.jar - - io.grpc-grpc-xds-1.42.1.jar - - io.grpc-grpc-rls-1.42.1.jar + - io.grpc-grpc-all-1.45.1.jar + - io.grpc-grpc-auth-1.45.1.jar + - io.grpc-grpc-context-1.45.1.jar + - io.grpc-grpc-core-1.45.1.jar + - io.grpc-grpc-netty-1.45.1.jar + - io.grpc-grpc-protobuf-1.45.1.jar + - io.grpc-grpc-protobuf-lite-1.45.1.jar + - io.grpc-grpc-stub-1.45.1.jar + - io.grpc-grpc-alts-1.45.1.jar + - io.grpc-grpc-api-1.45.1.jar + - io.grpc-grpc-grpclb-1.45.1.jar + - io.grpc-grpc-netty-shaded-1.45.1.jar + - io.grpc-grpc-services-1.45.1.jar + - io.grpc-grpc-xds-1.45.1.jar + - io.grpc-grpc-rls-1.45.1.jar * Perfmark - io.perfmark-perfmark-api-0.19.0.jar * OpenCensus - - io.opencensus-opencensus-api-0.18.0.jar - - io.opencensus-opencensus-contrib-http-util-0.24.0.jar + - io.opencensus-opencensus-api-0.28.0.jar + - io.opencensus-opencensus-contrib-http-util-0.28.0.jar - io.opencensus-opencensus-proto-0.2.0.jar * Jodah - net.jodah-typetools-0.5.0.jar @@ -518,17 +522,18 @@ The Apache Software License, Version 2.0 * Snappy Java - org.xerial.snappy-snappy-java-1.1.7.jar * Google HTTP Client - - com.google.http-client-google-http-client-jackson2-1.38.0.jar - - com.google.http-client-google-http-client-1.38.0.jar - - com.google.auto.value-auto-value-annotations-1.7.4.jar + - com.google.http-client-google-http-client-jackson2-1.41.0.jar + - com.google.http-client-google-http-client-gson-1.41.0.jar + - com.google.http-client-google-http-client-1.41.0.jar + - com.google.auto.value-auto-value-annotations-1.9.jar - com.google.re2j-re2j-1.5.jar * IPAddress - com.github.seancfoley-ipaddress-5.3.3.jar BSD 3-clause "New" or "Revised" License * Google auth library - - com.google.auth-google-auth-library-credentials-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt - - com.google.auth-google-auth-library-oauth2-http-0.22.2.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-credentials-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-oauth2-http-1.4.0.jar -- licenses/LICENSE-google-auth-library.txt * LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt @@ -546,8 +551,8 @@ MIT License Protocol Buffers License * Protocol Buffers - - com.google.protobuf-protobuf-java-3.16.1.jar -- licenses/LICENSE-protobuf.txt - - com.google.protobuf-protobuf-java-util-3.16.1.jar -- licenses/LICENSE-protobuf.txt + - com.google.protobuf-protobuf-java-3.19.2.jar -- licenses/LICENSE-protobuf.txt + - com.google.protobuf-protobuf-java-util-3.19.2.jar -- licenses/LICENSE-protobuf.txt CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Java Annotations API diff --git a/pom.xml b/pom.xml index d3a37af7a2da9..8319ca5c7a63c 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ flexible messaging model and an intuitive client API. 1.1.7 3.2.5 5.1.0 - 4.1.74.Final - 2.0.48.Final + 4.1.76.Final + 2.0.51.Final 9.4.43.v20210629 2.5.2 2.34 @@ -130,9 +130,10 @@ flexible messaging model and an intuitive client API. 8.37 1.4.13 0.5.0 - 3.16.1 + 3.19.2 ${protobuf3.version} - 1.42.1 + 1.45.1 + 1.41.0 0.19.0 ${grpc.version} 2.8.9 @@ -159,7 +160,7 @@ flexible messaging model and an intuitive client API. 1.0.0.Final 42.2.25 0.11.1 - 0.18.0 + 0.28.0 2.3.0 30.1-jre 1.0 @@ -917,6 +918,24 @@ flexible messaging model and an intuitive client API. ${grpc.version} + + com.google.http-client + google-http-client + ${google-http-client.version} + + + + com.google.http-client + google-http-client-jackson2 + ${google-http-client.version} + + + + com.google.http-client + google-http-client-gson + ${google-http-client.version} + + io.perfmark perfmark-api @@ -1067,6 +1086,12 @@ flexible messaging model and an intuitive client API. ${opencensus.version} + + io.opencensus + opencensus-contrib-http-util + ${opencensus.version} + + io.opencensus opencensus-contrib-grpc-metrics diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 7970280b6a2ed..0c34778440305 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -233,23 +233,40 @@ The Apache Software License, Version 2.0 - commons-lang3-3.11.jar * Netty - netty-3.10.6.Final.jar - - netty-buffer-4.1.74.Final.jar - - netty-codec-4.1.74.Final.jar - - netty-codec-dns-4.1.74.Final.jar - - netty-codec-http-4.1.74.Final.jar - - netty-codec-haproxy-4.1.74.Final.jar - - netty-common-4.1.74.Final.jar - - netty-handler-4.1.74.Final.jar + - netty-buffer-4.1.76.Final.jar + - netty-codec-4.1.76.Final.jar + - netty-codec-dns-4.1.76.Final.jar + - netty-codec-http-4.1.76.Final.jar + - netty-codec-haproxy-4.1.76.Final.jar + - netty-codec-socks-4.1.76.Final.jar + - netty-handler-proxy-4.1.76.Final.jar + - netty-common-4.1.76.Final.jar + - netty-handler-4.1.76.Final.jar - netty-reactive-streams-2.0.4.jar - - netty-resolver-4.1.74.Final.jar - - netty-resolver-dns-4.1.74.Final.jar - - netty-tcnative-boringssl-static-2.0.48.Final.jar - - netty-tcnative-classes-2.0.48.Final.jar - - netty-transport-4.1.74.Final.jar - - netty-transport-classes-epoll-4.1.74.Final.jar - - netty-transport-native-epoll-4.1.74.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.74.Final.jar - - netty-transport-native-unix-common-4.1.74.Final-linux-x86_64.jar + - netty-resolver-4.1.76.Final.jar + - netty-resolver-dns-4.1.76.Final.jar + - netty-tcnative-boringssl-static-2.0.51.Final.jar + - netty-tcnative-boringssl-static-2.0.51.Final-linux-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.51.Final-linux-x86_64.jar + - netty-tcnative-boringssl-static-2.0.51.Final-osx-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.51.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.51.Final-windows-x86_64.jar + - netty-tcnative-classes-2.0.51.Final.jar + - netty-transport-4.1.76.Final.jar + - netty-transport-classes-epoll-4.1.76.Final.jar + - netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.76.Final.jar + - netty-transport-native-unix-common-4.1.76.Final-linux-x86_64.jar + - netty-codec-http2-4.1.76.Final.jar + * GRPC + - grpc-api-1.45.1.jar + - grpc-context-1.45.1.jar + - grpc-core-1.45.1.jar + - grpc-grpclb-1.45.1.jar + - grpc-netty-1.45.1.jar + - grpc-protobuf-1.45.1.jar + - grpc-protobuf-lite-1.45.1.jar + - grpc-stub-1.45.1.jar * Joda Time - joda-time-2.10.5.jar * Jetty @@ -459,7 +476,8 @@ The Apache Software License, Version 2.0 Protocol Buffers License * Protocol Buffers - - protobuf-java-3.16.1.jar + - protobuf-java-3.19.2.jar + - protobuf-java-util-3.19.2.jar BSD 3-clause "New" or "Revised" License * RE2J TD -- re2j-td-1.4.jar