Author: phunt
Date: Thu May 5 20:52:23 2016
New Revision: 1742473
URL: http://svn.apache.org/viewvc?rev=1742473&view=rev
Log:
ZOOKEEPER-2423: Upgrade Netty version due to security vulnerability
(CVE-2014-3488) (Michael Han via phunt)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/ivy.xml
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1742473&r1=1742472&r2=1742473&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu May 5 20:52:23 2016
@@ -150,6 +150,9 @@ BUGFIXES:
ZOOKEEPER-2413: ContainerManager doesn't close the Timer it
creates when stop() is called (Jordan via fpj)
+ ZOOKEEPER-2423: Upgrade Netty version due to security vulnerability
+ (CVE-2014-3488) (Michael Han via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/ivy.xml
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/ivy.xml?rev=1742473&r1=1742472&r2=1742473&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/ivy.xml (original)
+++ zookeeper/branches/branch-3.5/ivy.xml Thu May 5 20:52:23 2016
@@ -50,7 +50,7 @@
<dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="jline" name="jline" rev="2.11" transitive="false"
conf="optional->default"/>
- <dependency org="io.netty" name="netty" conf="default" rev="3.7.1.Final">
+ <dependency org="io.netty" name="netty" conf="default" rev="3.10.5.Final">
<artifact name="netty" type="jar" conf="default"/>
</dependency>
