You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2021/11/27 06:55:51 UTC

[zookeeper] branch branch-3.6 updated: ZOOKEEPER-4414: Update Netty to 4.1.70.Final on branch-3.6

This is an automated email from the ASF dual-hosted git repository.

maoling pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new 6cb9fd1  ZOOKEEPER-4414: Update Netty to 4.1.70.Final on branch-3.6
6cb9fd1 is described below

commit 6cb9fd13a11b7573b966d809df8f6135f4bf41bf
Author: Frederiko Costa <fr...@workday.com>
AuthorDate: Sat Nov 27 14:55:39 2021 +0800

    ZOOKEEPER-4414: Update Netty to 4.1.70.Final on branch-3.6
    
    Author: Frederiko Costa <fr...@workday.com>
    
    Reviewers: maoling <ma...@apache.org>
    
    Closes #1777 from frederiko/ZOOKEEPER-4414_netty_4.1.70.Final_branch_3.6
---
 pom.xml                                                                 | 2 +-
 ...n-4.1.63.Final.LICENSE.txt => netty-buffer-4.1.70.Final.LICENSE.txt} | 0
 ...ll-4.1.63.Final.LICENSE.txt => netty-codec-4.1.70.Final.LICENSE.txt} | 0
 ...t-4.1.63.Final.LICENSE.txt => netty-common-4.1.70.Final.LICENSE.txt} | 0
 ...-4.1.63.Final.LICENSE.txt => netty-handler-4.1.70.Final.LICENSE.txt} | 0
 ...4.1.63.Final.LICENSE.txt => netty-resolver-4.1.70.Final.LICENSE.txt} | 0
 ....1.63.Final.LICENSE.txt => netty-transport-4.1.70.Final.LICENSE.txt} | 0
 ...ICENSE.txt => netty-transport-native-epoll-4.1.70.Final.LICENSE.txt} | 0
 ....txt => netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt} | 0
 9 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd9d41b..3488c2f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -355,7 +355,7 @@
     <mockito.version>2.27.0</mockito.version>
     <hamcrest.version>1.3</hamcrest.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <netty.version>4.1.63.Final</netty.version>
+    <netty.version>4.1.70.Final</netty.version>
     <jetty.version>9.4.43.v20210629</jetty.version>
     <jackson.version>2.10.5.1</jackson.version>
     <json.version>1.1.1</json.version>
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt