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)
Jason918 · Aug 1, 2022 · b7229b9 · b7229b9
1 parent f741a56
commit b7229b9
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 57 deletions.
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-common</artifactId>
-      <version>4.1.68.Final</version>
+      <version>4.1.76.Final</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -357,24 +357,31 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-compress-1.21.jar
     - org.apache.commons-commons-lang3-3.6.jar
  * Netty
-    - io.netty-netty-buffer-4.1.68.Final.jar
-    - io.netty-netty-codec-4.1.68.Final.jar
-    - io.netty-netty-codec-dns-4.1.68.Final.jar
-    - io.netty-netty-codec-http-4.1.68.Final.jar
-    - io.netty-netty-codec-http2-4.1.68.Final.jar
-    - io.netty-netty-codec-socks-4.1.68.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.68.Final.jar
-    - io.netty-netty-common-4.1.68.Final.jar
-    - io.netty-netty-handler-4.1.68.Final.jar
-    - io.netty-netty-handler-proxy-4.1.68.Final.jar
-    - io.netty-netty-resolver-4.1.68.Final.jar
-    - io.netty-netty-resolver-dns-4.1.68.Final.jar
-    - io.netty-netty-transport-4.1.68.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.68.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.68.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.68.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.42.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,20 +463,24 @@ 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.18.0.jar
-    - io.grpc-grpc-auth-1.18.0.jar
-    - io.grpc-grpc-context-1.18.0.jar
-    - io.grpc-grpc-core-1.18.0.jar
-    - io.grpc-grpc-netty-1.18.0.jar
-    - io.grpc-grpc-okhttp-1.18.0.jar
-    - io.grpc-grpc-protobuf-1.18.0.jar
-    - io.grpc-grpc-protobuf-lite-1.18.0.jar
-    - io.grpc-grpc-stub-1.18.0.jar
-    - io.grpc-grpc-protobuf-nano-1.18.0.jar
-    - io.grpc-grpc-testing-1.18.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
   * OpenCensus
-    - io.opencensus-opencensus-api-0.18.0.jar
-    - io.opencensus-opencensus-contrib-grpc-metrics-0.18.0.jar
+    - io.opencensus-opencensus-api-0.28.0.jar
+    - io.opencensus-opencensus-contrib-http-util-0.28.0.jar
   * Jodah
     - net.jodah-typetools-0.5.0.jar
   * Apache Avro
@@ -517,7 +528,8 @@ The Apache Software License, Version 2.0
 
 BSD 3-clause "New" or "Revised" License
  * Google auth library
-    - com.google.auth-google-auth-library-credentials-0.9.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
  * JavaHamcrest -- org.hamcrest-hamcrest-core-1.3.jar -- licenses/LICENSE-Hamcrest.txt
@@ -539,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
    - com.google.protobuf.nano-protobuf-javanano-3.0.0-alpha-5.jar -- licenses/LICENSE-protobuf.txt
 
 CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt

diff --git a/pom.xml b/pom.xml
@@ -100,8 +100,8 @@ flexible messaging model and an intuitive client API.</description>
 
     <bookkeeper.version>4.12.1</bookkeeper.version>
     <zookeeper.version>3.5.9</zookeeper.version>
-    <netty.version>4.1.68.Final</netty.version>
-    <netty-tc-native.version>2.0.42.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>
     <jersey.version>2.31</jersey.version>
     <athenz.version>1.10.9</athenz.version>
@@ -122,9 +122,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.18.0</grpc.version>
+    <grpc.version>1.45.1</grpc.version>
+    <google-http-client.version>1.41.0</google-http-client.version>
     <protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
     <gson.version>2.8.9</gson.version>
     <sketches.version>0.8.3</sketches.version>
@@ -150,7 +151,7 @@ flexible messaging model and an intuitive client API.</description>
     <scala-library.version>2.11.12</scala-library.version>
     <debezium.version>1.0.0.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>
@@ -598,7 +599,7 @@ flexible messaging model and an intuitive client API.</description>
         <artifactId>jna</artifactId>
         <version>${jna.version}</version>
       </dependency>
-      
+
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java-core</artifactId>
@@ -805,6 +806,24 @@ flexible messaging model and an intuitive client API.</description>
         <version>${grpc.version}</version>
       </dependency>
 
+      <dependency>
+        <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>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>
@@ -918,6 +937,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
@@ -233,21 +233,44 @@ The Apache Software License, Version 2.0
     - commons-lang3-3.6.jar
  * Netty
     - netty-3.10.6.Final.jar
-    - netty-buffer-4.1.68.Final.jar
-    - netty-codec-4.1.68.Final.jar
-    - netty-codec-dns-4.1.68.Final.jar
-    - netty-codec-http-4.1.68.Final.jar
-    - netty-codec-haproxy-4.1.68.Final.jar
-    - netty-common-4.1.68.Final.jar
-    - netty-handler-4.1.68.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.68.Final.jar
-    - netty-resolver-dns-4.1.68.Final.jar
-    - netty-tcnative-boringssl-static-2.0.42.Final.jar
-    - netty-transport-4.1.68.Final.jar
-    - netty-transport-native-epoll-4.1.68.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.68.Final.jar
-    - netty-transport-native-unix-common-4.1.68.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.42.1.jar
+    - grpc-context-1.42.1.jar
+    - grpc-core-1.42.1.jar
+    - grpc-grpclb-1.42.1.jar
+    - grpc-netty-1.42.1.jar
+    - grpc-protobuf-1.42.1.jar
+    - grpc-protobuf-lite-1.42.1.jar
+    - grpc-stub-1.42.1.jar
+  * JEtcd
+    - jetcd-common-0.5.11.jar
+    - jetcd-core-0.5.11.jar
+
  * Joda Time
     - joda-time-2.10.5.jar
     - joda-time-2.10.1.jar
@@ -465,8 +488,8 @@ The Apache Software License, Version 2.0
 Protocol Buffers License
  * Protocol Buffers
    - protobuf-shaded-2.1.0-incubating.jar
-   - 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