Upgrade Netty to 4.1.76.Final, Netty Tcnative, grpc and protobuf (apa…

…che#15212) * Upgrade Netty to 4.1.76.Final and Netty Tcnative to 2.0.51.Final Fixes apache#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 (cherry picked from commit 332a3c7)
datastax · Apr 20, 2022 · 4afb0a6 · 4afb0a6
1 parent 9feabea
commit 4afb0a6
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 84 deletions.
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -358,26 +358,31 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-compress-1.19.jar
     - org.apache.commons-commons-lang3-3.6.jar
  * Netty
-    - io.netty-netty-buffer-4.1.72.Final.jar
-    - io.netty-netty-codec-4.1.72.Final.jar
-    - io.netty-netty-codec-dns-4.1.72.Final.jar
-    - io.netty-netty-codec-http-4.1.72.Final.jar
-    - io.netty-netty-codec-http2-4.1.72.Final.jar
-    - io.netty-netty-codec-socks-4.1.72.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.72.Final.jar
-    - io.netty-netty-common-4.1.72.Final.jar
-    - io.netty-netty-handler-4.1.72.Final.jar
-    - io.netty-netty-handler-proxy-4.1.72.Final.jar
-    - io.netty-netty-resolver-4.1.72.Final.jar
-    - io.netty-netty-resolver-dns-4.1.72.Final.jar
-    - io.netty-netty-transport-4.1.72.Final.jar
-    - io.netty-netty-transport-classes-epoll-4.1.72.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.72.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.72.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.72.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.72.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.46.Final.jar
-    - io.netty-netty-tcnative-classes-2.0.46.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
@@ -461,26 +466,26 @@ The Apache Software License, Version 2.0
  * Okio - com.squareup.okio-okio-1.13.0.jar
  * Javassist -- org.javassist-javassist-3.25.0-GA.jar
  * gRPC
-    - io.grpc-grpc-all-1.33.0.jar
-    - io.grpc-grpc-auth-1.33.0.jar
-    - io.grpc-grpc-context-1.33.0.jar
-    - io.grpc-grpc-core-1.33.0.jar
-    - io.grpc-grpc-netty-1.33.0.jar
-    - io.grpc-grpc-okhttp-1.33.0.jar
-    - io.grpc-grpc-protobuf-1.33.0.jar
-    - io.grpc-grpc-protobuf-lite-1.33.0.jar
-    - io.grpc-grpc-stub-1.33.0.jar
-    - io.grpc-grpc-alts-1.33.0.jar
-    - io.grpc-grpc-api-1.33.0.jar
-    - io.grpc-grpc-grpclb-1.33.0.jar
-    - io.grpc-grpc-netty-shaded-1.33.0.jar
-    - io.grpc-grpc-services-1.33.0.jar
-    - io.grpc-grpc-xds-1.33.0.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
@@ -530,14 +535,15 @@ The Apache Software License, Version 2.0
   * IPAddress
     - com.github.seancfoley-ipaddress-5.3.3.jar
   * Google HTTP Client
-    - com.google.http-client-google-http-client-jackson2-1.34.0.jar
-    - com.google.http-client-google-http-client-1.34.0.jar
-    - com.google.auto.value-auto-value-annotations-1.7.jar
-    - com.google.re2j-re2j-1.2.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
 BSD 3-clause "New" or "Revised" License
  * Google auth library
-    - com.google.auth-google-auth-library-credentials-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt
-    - com.google.auth-google-auth-library-oauth2-http-0.20.0.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
 
@@ -555,8 +561,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
@@ -105,8 +105,8 @@ flexible messaging model and an intuitive client API.</description>
 
     <bookkeeper.version>4.14.3</bookkeeper.version>
     <zookeeper.version>3.5.9</zookeeper.version>
-    <netty.version>4.1.72.Final</netty.version>
-    <netty-tc-native.version>2.0.46.Final</netty-tc-native.version>
+    <netty.version>4.1.76.Final</netty.version>
+    <netty-tc-native.version>2.0.51.Final</netty-tc-native.version>
     <jetty.version>9.4.43.v20210629</jetty.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <jersey.version>2.31</jersey.version>
@@ -128,9 +128,10 @@ flexible messaging model and an intuitive client API.</description>
     <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
     <typetools.version>0.5.0</typetools.version>
     <protobuf2.version>2.4.1</protobuf2.version>
-    <protobuf3.version>3.16.1</protobuf3.version>
+    <protobuf3.version>3.19.2</protobuf3.version>
     <protoc3.version>${protobuf3.version}</protoc3.version>
-    <grpc.version>1.33.0</grpc.version>
+    <grpc.version>1.45.1</grpc.version>
+    <google-http-client.version>1.41.0</google-http-client.version>
     <perfmark.version>0.19.0</perfmark.version>
     <protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
     <gson.version>2.8.9</gson.version>
@@ -157,7 +158,7 @@ flexible messaging model and an intuitive client API.</description>
     <scala-library.version>2.13.6</scala-library.version>
     <debezium.version>1.7.1.Final</debezium.version>
     <jsonwebtoken.version>0.11.1</jsonwebtoken.version>
-    <opencensus.version>0.18.0</opencensus.version>
+    <opencensus.version>0.28.0</opencensus.version>
     <hbase.version>2.3.0</hbase.version>
     <guava.version>30.1-jre</guava.version>
     <jcip.version>1.0</jcip.version>
@@ -829,6 +830,14 @@ flexible messaging model and an intuitive client API.</description>
         <version>${typetools.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>${grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-all</artifactId>
@@ -843,9 +852,21 @@ flexible messaging model and an intuitive client API.</description>
       </dependency>
 
       <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-core</artifactId>
-        <version>${grpc.version}</version>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client</artifactId>
+        <version>${google-http-client.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-jackson2</artifactId>
+        <version>${google-http-client.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-gson</artifactId>
+        <version>${google-http-client.version}</version>
       </dependency>
 
       <dependency>
@@ -861,19 +882,6 @@ flexible messaging model and an intuitive client API.</description>
         </exclusions>
       </dependency>
 
-      <dependency>
-
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-stub</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-protobuf-lite</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-bom</artifactId>
@@ -977,6 +985,12 @@ flexible messaging model and an intuitive client API.</description>
         <version>${opencensus.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.opencensus</groupId>
+        <artifactId>opencensus-contrib-http-util</artifactId>
+        <version>${opencensus.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-contrib-grpc-metrics</artifactId>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -232,23 +232,39 @@ The Apache Software License, Version 2.0
     - commons-lang3-3.6.jar
  * Netty
     - netty-3.10.6.Final.jar
-    - netty-buffer-4.1.72.Final.jar
-    - netty-codec-4.1.72.Final.jar
-    - netty-codec-dns-4.1.72.Final.jar
-    - netty-codec-http-4.1.72.Final.jar
-    - netty-codec-haproxy-4.1.72.Final.jar
-    - netty-common-4.1.72.Final.jar
-    - netty-handler-4.1.72.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.72.Final.jar
-    - netty-resolver-dns-4.1.72.Final.jar
-    - netty-tcnative-boringssl-static-2.0.46.Final.jar
-    - netty-tcnative-classes-2.0.46.Final.jar
-    - netty-transport-4.1.72.Final.jar
-    - netty-transport-classes-epoll-4.1.72.Final.jar
-    - netty-transport-native-epoll-4.1.72.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.72.Final.jar
-    - netty-transport-native-unix-common-4.1.72.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-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
     - joda-time-2.10.1.jar
@@ -471,8 +487,8 @@ The Apache Software License, Version 2.0
 
 Protocol Buffers License
  * Protocol Buffers
-   - protobuf-java-3.16.1.jar
-   - protobuf-java-util-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