You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2022/01/27 14:36:27 UTC

[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4454: Upgrade Netty to 4.1.73

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

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


The following commit(s) were added to refs/heads/branch-3.7 by this push:
     new 510088b  ZOOKEEPER-4454: Upgrade Netty to 4.1.73
510088b is described below

commit 510088be1bdd154e84f365fcf87a57ed7e493edb
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Jan 27 15:34:36 2022 +0100

    ZOOKEEPER-4454: Upgrade Netty to 4.1.73
    
    Author: Enrico Olivelli <eo...@apache.org>
    
    Reviewers: symat@apache.org, cnauroth@apache.org
    
    Closes #1801 from eolivelli/fix/netty-4.1.72
    
    (cherry picked from commit d45d5df963cc3f7641d6dec2920bb22cfe8d0a76)
    Signed-off-by: Andor Molnar <an...@apache.org>
---
 pom.xml                                                                 | 2 +-
 ...n-4.1.70.Final.LICENSE.txt => netty-buffer-4.1.73.Final.LICENSE.txt} | 0
 ...ll-4.1.70.Final.LICENSE.txt => netty-codec-4.1.73.Final.LICENSE.txt} | 0
 ...t-4.1.70.Final.LICENSE.txt => netty-common-4.1.73.Final.LICENSE.txt} | 0
 ...-4.1.70.Final.LICENSE.txt => netty-handler-4.1.73.Final.LICENSE.txt} | 0
 ...4.1.70.Final.LICENSE.txt => netty-resolver-4.1.73.Final.LICENSE.txt} | 0
 ....1.70.Final.LICENSE.txt => netty-transport-4.1.73.Final.LICENSE.txt} | 0
 ...ICENSE.txt => netty-transport-native-epoll-4.1.73.Final.LICENSE.txt} | 0
 ....txt => netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt} | 0
 9 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cd255b3..049113f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -437,7 +437,7 @@
     <mockito.version>3.6.28</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.4</commons-cli.version>
-    <netty.version>4.1.70.Final</netty.version>
+    <netty.version>4.1.73.Final</netty.version>
     <jetty.version>9.4.43.v20210629</jetty.version>
     <jackson.version>2.13.1</jackson.version>
     <jline.version>2.14.6</jline.version>
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-buffer-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-codec-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-common-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-common-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-handler-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-resolver-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.73.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt