diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index 42bcc82512..5a1a653086 100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@ -251,8 +251,8 @@
-
-
+
+
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 954127b87c..4827ad4a6a 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -38,7 +38,7 @@
1.12.13
4.0.20
- 4.1.113.Final
+ 4.1.119.Final
0.5.1
@@ -800,7 +800,7 @@
io.netty
netty-tcnative-boringssl-static
- 2.0.61.Final
+ 2.0.70.Final
org.bouncycastle
diff --git a/CHANGES.txt b/CHANGES.txt
index 9bf7069174..6476423f1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -164,6 +164,7 @@
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
Merged from 5.0:
+ * Update netty to 4.1.119.Final and netty-tcnative to 2.0.70.Final (CASSANDRA-20314)
* Serialization can lose complex deletions in a mutation with multiple collections in a row (CASSANDRA-20449)
* Improve error messages when initializing auth classes (CASSANDRA-20368)
* Prioritize legacy 2i over SAI for columns with multiple indexes (CASSANDRA-20334)