From 63af2c97944d647a071d3a3339c9df9eac27bb3b Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Fri, 11 Jun 2021 13:26:46 +0300
Subject: [PATCH] Revert "Upgrade Netty version to 4.1.60.final (#10073)"

This reverts commit ae606b9e7d35bb524ccdb5f6f5b0c6a9d061a939.
---
 .../server/src/assemble/LICENSE.bin.txt       | 36 +++++++++----------
 pom.xml                                       |  4 +--
 pulsar-sql/presto-distribution/LICENSE        | 28 +++++++--------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index f5f5d9ae370ca..71b5984b020b6 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -352,24 +352,24 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-compress-1.19.jar
     - org.apache.commons-commons-lang3-3.11.jar
  * Netty
-    - io.netty-netty-buffer-4.1.60.Final.jar
-    - io.netty-netty-codec-4.1.60.Final.jar
-    - io.netty-netty-codec-dns-4.1.60.Final.jar
-    - io.netty-netty-codec-http-4.1.60.Final.jar
-    - io.netty-netty-codec-http2-4.1.60.Final.jar
-    - io.netty-netty-codec-socks-4.1.60.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.60.Final.jar
-    - io.netty-netty-common-4.1.60.Final.jar
-    - io.netty-netty-handler-4.1.60.Final.jar
-    - io.netty-netty-handler-proxy-4.1.60.Final.jar
-    - io.netty-netty-resolver-4.1.60.Final.jar
-    - io.netty-netty-resolver-dns-4.1.60.Final.jar
-    - io.netty-netty-transport-4.1.60.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.60.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.60.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.60.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.60.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.36.Final.jar
+    - io.netty-netty-buffer-4.1.51.Final.jar
+    - io.netty-netty-codec-4.1.51.Final.jar
+    - io.netty-netty-codec-dns-4.1.51.Final.jar
+    - io.netty-netty-codec-http-4.1.51.Final.jar
+    - io.netty-netty-codec-http2-4.1.51.Final.jar
+    - io.netty-netty-codec-socks-4.1.51.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.51.Final.jar
+    - io.netty-netty-common-4.1.51.Final.jar
+    - io.netty-netty-handler-4.1.51.Final.jar
+    - io.netty-netty-handler-proxy-4.1.51.Final.jar
+    - io.netty-netty-resolver-4.1.51.Final.jar
+    - io.netty-netty-resolver-dns-4.1.51.Final.jar
+    - io.netty-netty-transport-4.1.51.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.51.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.51.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.33.Final.jar
  * Prometheus client
     - io.prometheus-simpleclient-0.5.0.jar
     - io.prometheus-simpleclient_common-0.5.0.jar
diff --git a/pom.xml b/pom.xml
index 8eb692e85607f..dd44213a99c15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,8 +108,8 @@ flexible messaging model and an intuitive client API.</description>
     <snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
     <dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
     <curator.version>5.1.0</curator.version>
-    <netty.version>4.1.60.Final</netty.version>
-    <netty-tc-native.version>2.0.36.Final</netty-tc-native.version>
+    <netty.version>4.1.51.Final</netty.version>
+    <netty-tc-native.version>2.0.33.Final</netty-tc-native.version>
     <jetty.version>9.4.39.v20210325</jetty.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <jersey.version>2.34</jersey.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index b7cbb0217bfb9..be38dda13567f 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -233,21 +233,21 @@ The Apache Software License, Version 2.0
     - commons-lang3-3.11.jar
  * Netty
     - netty-3.10.6.Final.jar
-    - netty-buffer-4.1.60.Final.jar
-    - netty-codec-4.1.60.Final.jar
-    - netty-codec-dns-4.1.60.Final.jar
-    - netty-codec-http-4.1.60.Final.jar
-    - netty-codec-haproxy-4.1.60.Final.jar
-    - netty-common-4.1.60.Final.jar
-    - netty-handler-4.1.60.Final.jar
+    - netty-buffer-4.1.51.Final.jar
+    - netty-codec-4.1.51.Final.jar
+    - netty-codec-dns-4.1.51.Final.jar
+    - netty-codec-http-4.1.51.Final.jar
+    - netty-codec-haproxy-4.1.51.Final.jar
+    - netty-common-4.1.51.Final.jar
+    - netty-handler-4.1.51.Final.jar
     - netty-reactive-streams-2.0.4.jar
-    - netty-resolver-4.1.60.Final.jar
-    - netty-resolver-dns-4.1.60.Final.jar
-    - netty-tcnative-boringssl-static-2.0.36.Final.jar
-    - netty-transport-4.1.60.Final.jar
-    - netty-transport-native-epoll-4.1.60.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.60.Final.jar
-    - netty-transport-native-unix-common-4.1.60.Final-linux-x86_64.jar
+    - netty-resolver-4.1.51.Final.jar
+    - netty-resolver-dns-4.1.51.Final.jar
+    - netty-tcnative-boringssl-static-2.0.33.Final.jar
+    - netty-transport-4.1.51.Final.jar
+    - netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.51.Final.jar
+    - netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar
  * Joda Time
     - joda-time-2.10.5.jar
   * Jetty