Bump Netty to 4.1.84

https://netty.io/news/2022/05/06/2-1-77-Final.html
https://netty.io/news/2022/06/14/4-1-78-Final.html
https://netty.io/news/2022/07/11/4-1-79-Final.html
https://netty.io/news/2022/08/26/4-1-80-Final.html
https://netty.io/news/2022/09/08/4-1-81-Final.html
https://netty.io/news/2022/09/13/4-1-82-Final.html
https://netty.io/news/2022/10/11/4-1-84-Final.html

We also switch off the aarch64 epoll support, as it does not work in
OSGi.

Change-Id: I87796b92938bb7224ee33578b0d076c90b4f69c9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-netty-4/pom.xml b/features/odl-netty-4/pom.xml
index 8eb13c96082e1e1d0333bdcc506314935dc776c7..a2dc56f61ea6fbaa7f3c93a8fe6b69759550bf2a 100644 (file)
--- a/features/odl-netty-4/pom.xml
+++ b/features/odl-netty-4/pom.xml
@@ -43,21 +43,21 @@
         <!--
             Here we need to depend on 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) -->
-        <dependency>
+        <!--dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <classifier>linux-aarch_64</classifier>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <classifier>linux-x86_64</classifier>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>
             <classifier>linux-aarch_64</classifier>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>

diff --git a/features/odl-netty-4/src/main/history/dependencies.xml b/features/odl-netty-4/src/main/history/dependencies.xml
index 3d6f1bf5010d1a9e3a5a53ef9a1641c20ddc66d7..6217179bf7dcca917e7710b5332581a55530882a 100644 (file)
--- a/features/odl-netty-4/src/main/history/dependencies.xml
+++ b/features/odl-netty-4/src/main/history/dependencies.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-netty-4">
     <feature version="0.0.0">
-        <bundle>mvn:io.netty/netty-buffer/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-common/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-resolver/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport-classes-epoll/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.76.Final/jar/linux-aarch_64</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.76.Final/jar/linux-x86_64</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.76.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.76.Final/jar/linux-aarch_64</bundle>
-        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.76.Final/jar/linux-x86_64</bundle>
+        <bundle>mvn:io.netty/netty-buffer/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec-http/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-common/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-handler/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-resolver/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-classes-epoll/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.84.Final/jar/linux-x86_64</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.84.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.84.Final/jar/linux-x86_64</bundle>
     </feature>
 </features>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 89c25f1b8c020caddd6aec130e8011759b034ba1..3a1d584a19296376bbcfe3e9eeb950da30a65df4 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -109,7 +109,7 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-bom</artifactId>
             <type>pom</type>
-            <version>4.1.76.Final</version>
+            <version>4.1.84.Final</version>
         </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 562c288f8352a01860937390591454df6cd21119..93048ae51dc2df8af5d006d8d3d7087654686636 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -396,7 +396,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>4.1.76.Final</version>
+        <version>4.1.84.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>