Revert "[improve][misc] Upgrade to Netty 4.1.111.Final and switch to …

…use grpc-netty-shaded (apache#22892)" This reverts commit 75d7e55.
lhotari · Jun 14, 2024 · 3396138 · 3396138
1 parent f7d35e5
commit 3396138
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 329 deletions.
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
@@ -39,19 +39,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>pulsar-metadata</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>jetcd-core-shaded</artifactId>
-      <version>${project.version}</version>
-      <classifier>shaded</classifier>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-docs-tools</artifactId>

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -292,27 +292,27 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-lang3-3.11.jar
     - org.apache.commons-commons-text-1.10.0.jar
  * Netty
-    - io.netty-netty-buffer-4.1.111.Final.jar
-    - io.netty-netty-codec-4.1.111.Final.jar
-    - io.netty-netty-codec-dns-4.1.111.Final.jar
-    - io.netty-netty-codec-http-4.1.111.Final.jar
-    - io.netty-netty-codec-http2-4.1.111.Final.jar
-    - io.netty-netty-codec-socks-4.1.111.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.111.Final.jar
-    - io.netty-netty-common-4.1.111.Final.jar
-    - io.netty-netty-handler-4.1.111.Final.jar
-    - io.netty-netty-handler-proxy-4.1.111.Final.jar
-    - io.netty-netty-resolver-4.1.111.Final.jar
-    - io.netty-netty-resolver-dns-4.1.111.Final.jar
-    - io.netty-netty-resolver-dns-classes-macos-4.1.111.Final.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar
-    - io.netty-netty-transport-4.1.111.Final.jar
-    - io.netty-netty-transport-classes-epoll-4.1.111.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-unix-common-4.1.111.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar
+    - io.netty-netty-buffer-4.1.108.Final.jar
+    - io.netty-netty-codec-4.1.108.Final.jar
+    - io.netty-netty-codec-dns-4.1.108.Final.jar
+    - io.netty-netty-codec-http-4.1.108.Final.jar
+    - io.netty-netty-codec-http2-4.1.108.Final.jar
+    - io.netty-netty-codec-socks-4.1.108.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.108.Final.jar
+    - io.netty-netty-common-4.1.108.Final.jar
+    - io.netty-netty-handler-4.1.108.Final.jar
+    - io.netty-netty-handler-proxy-4.1.108.Final.jar
+    - io.netty-netty-resolver-4.1.108.Final.jar
+    - io.netty-netty-resolver-dns-4.1.108.Final.jar
+    - io.netty-netty-resolver-dns-classes-macos-4.1.108.Final.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar
+    - io.netty-netty-transport-4.1.108.Final.jar
+    - io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar
@@ -434,6 +434,7 @@ The Apache Software License, Version 2.0
     - io.grpc-grpc-auth-1.56.0.jar
     - io.grpc-grpc-context-1.56.0.jar
     - io.grpc-grpc-core-1.56.0.jar
+    - io.grpc-grpc-netty-1.56.0.jar
     - io.grpc-grpc-protobuf-1.56.0.jar
     - io.grpc-grpc-protobuf-lite-1.56.0.jar
     - io.grpc-grpc-stub-1.56.0.jar
@@ -497,6 +498,7 @@ The Apache Software License, Version 2.0
     - io.vertx-vertx-core-4.5.8.jar
     - io.vertx-vertx-web-4.5.8.jar
     - io.vertx-vertx-web-common-4.5.8.jar
+    - io.vertx-vertx-grpc-4.5.8.jar
   * Apache ZooKeeper
     - org.apache.zookeeper-zookeeper-3.9.2.jar
     - org.apache.zookeeper-zookeeper-jute-3.9.2.jar
@@ -508,7 +510,11 @@ The Apache Software License, Version 2.0
     - com.google.http-client-google-http-client-1.41.0.jar
     - com.google.auto.value-auto-value-annotations-1.10.1.jar
     - com.google.re2j-re2j-1.7.jar
-  * Jetcd - shaded
+  * Jetcd
+    - io.etcd-jetcd-api-0.7.7.jar
+    - io.etcd-jetcd-common-0.7.7.jar
+    - io.etcd-jetcd-core-0.7.7.jar
+    - io.etcd-jetcd-grpc-0.7.7.jar
   * IPAddress
     - com.github.seancfoley-ipaddress-5.5.0.jar
   * RxJava

diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -347,23 +347,23 @@ The Apache Software License, Version 2.0
     - commons-text-1.10.0.jar
     - commons-compress-1.26.0.jar
  * Netty
-    - netty-buffer-4.1.111.Final.jar
-    - netty-codec-4.1.111.Final.jar
-    - netty-codec-dns-4.1.111.Final.jar
-    - netty-codec-http-4.1.111.Final.jar
-    - netty-codec-socks-4.1.111.Final.jar
-    - netty-codec-haproxy-4.1.111.Final.jar
-    - netty-common-4.1.111.Final.jar
-    - netty-handler-4.1.111.Final.jar
-    - netty-handler-proxy-4.1.111.Final.jar
-    - netty-resolver-4.1.111.Final.jar
-    - netty-resolver-dns-4.1.111.Final.jar
-    - netty-transport-4.1.111.Final.jar
-    - netty-transport-classes-epoll-4.1.111.Final.jar
-    - netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar
-    - netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.111.Final.jar
-    - netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar
+    - netty-buffer-4.1.108.Final.jar
+    - netty-codec-4.1.108.Final.jar
+    - netty-codec-dns-4.1.108.Final.jar
+    - netty-codec-http-4.1.108.Final.jar
+    - netty-codec-socks-4.1.108.Final.jar
+    - netty-codec-haproxy-4.1.108.Final.jar
+    - netty-common-4.1.108.Final.jar
+    - netty-handler-4.1.108.Final.jar
+    - netty-handler-proxy-4.1.108.Final.jar
+    - netty-resolver-4.1.108.Final.jar
+    - netty-resolver-dns-4.1.108.Final.jar
+    - netty-transport-4.1.108.Final.jar
+    - netty-transport-classes-epoll-4.1.108.Final.jar
+    - netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+    - netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.108.Final.jar
+    - netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.65.Final.jar
     - netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar
     - netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar
@@ -374,9 +374,9 @@ The Apache Software License, Version 2.0
     - netty-incubator-transport-classes-io_uring-0.0.24.Final.jar
     - netty-incubator-transport-native-io_uring-0.0.24.Final-linux-aarch_64.jar
     - netty-incubator-transport-native-io_uring-0.0.24.Final-linux-x86_64.jar
-    - netty-resolver-dns-classes-macos-4.1.111.Final.jar
-    - netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar
-    - netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar
+    - netty-resolver-dns-classes-macos-4.1.108.Final.jar
+    - netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar
+    - netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar
  * Prometheus client
     - simpleclient-0.16.0.jar
     - simpleclient_log4j2-0.16.0.jar

diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml