From 38a672b67c56f17754263ab289bfe9515b62388f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 1 Oct 2019 13:16:59 +0200
Subject: [PATCH] Bump netty to 4.1.42

https://netty.io/news/2019/09/12/4-1-41-Final.html
https://netty.io/news/2019/09/25/4-1-42-Final.html

Change-Id: I3882602046370e4ee861335955258510bddd490e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 9c995d0b1f3fe4a6c9e1cdcf078c55d92629e914)
---
 .../src/main/history/dependencies.xml          | 18 +++++++++---------
 odlparent/pom.xml                              | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/features/odl-netty-4/src/main/history/dependencies.xml b/features/odl-netty-4/src/main/history/dependencies.xml
index c965295a65..0d815accda 100644
--- a/features/odl-netty-4/src/main/history/dependencies.xml
+++ b/features/odl-netty-4/src/main/history/dependencies.xml
@@ -2,14 +2,14 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-netty-4">
     <feature version="0.0.0">
         <feature>odl-javassist-3</feature>
-        <bundle>mvn:io.netty/netty-buffer/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-common/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-resolver/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.39.Final/jar/linux-x86_64</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.39.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.1.39.Final</bundle>
+        <bundle>mvn:io.netty/netty-buffer/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec-http/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-common/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-handler/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-resolver/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.42.Final/jar/linux-x86_64</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.42.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport/4.1.42.Final</bundle>
     </feature>
 </features>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 039e05d85a..f1d3f43be6 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -546,37 +546,37 @@
         <artifactId>netty-all</artifactId>
         <!-- If these are updated, the version in features.xml needs to be changed too -->
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec-http</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-common</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport</artifactId>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
       platform and we can't require the build platform to have an implementation (e.g. OS X) -->
@@ -584,7 +584,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-        <version>4.1.39.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>