Package more Netty native transports

Netty-4.1.74 has packaging finally fixed in that Java code is packaged
separately from native libraries and those are correctly attaching as
fragment bundles.

Add support for :
- epoll on linux/aarch64
- unix domain on linux/{aarch64,x86_64}

JIRA: ODLPARENT-241
Change-Id: Ie3bab85fcbe8cdf6cec0336fec56927cfdc45eda
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 92d4ba78511ced4e9a40a043ccad396fca76a82f..dde97aaad6f3278bd8de6c86db03589f727f11b6 100644 (file)
--- a/features/odl-netty-4/pom.xml
+++ b/features/odl-netty-4/pom.xml
@@ -40,11 +40,27 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
         </dependency>
-        <!-- 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) -->
+        <!--
+            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>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
+            <classifier>linux-aarch_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-unix-common</artifactId>
+            <classifier>linux-aarch_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-unix-common</artifactId>
             <classifier>linux-x86_64</classifier>
         </dependency>
     </dependencies>

diff --git a/features/odl-netty-4/src/main/history/dependencies.xml b/features/odl-netty-4/src/main/history/dependencies.xml
index 0ae837a8de3b9820a652f460e25d728f8eaa9566..63a654c239cdc633809c087832b5c03285258159 100644 (file)
--- a/features/odl-netty-4/src/main/history/dependencies.xml
+++ b/features/odl-netty-4/src/main/history/dependencies.xml
@@ -2,15 +2,18 @@
 <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.74.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.1.74.Final</bundle>
         <bundle>mvn:io.netty/netty-codec/4.1.74.Final</bundle>
+        <bundle>mvn:io.netty/netty-codec-http/4.1.74.Final</bundle>
         <bundle>mvn:io.netty/netty-common/4.1.74.Final</bundle>
         <bundle>mvn:io.netty/netty-handler/4.1.74.Final</bundle>
         <bundle>mvn:io.netty/netty-resolver/4.1.74.Final</bundle>
+        <bundle>mvn:io.netty/netty-tcnative-classes/2.0.48.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport/4.1.74.Final</bundle>
         <bundle>mvn:io.netty/netty-transport-classes-epoll/4.1.74.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.74.Final/jar/linux-aarch_64</bundle>
         <bundle>mvn:io.netty/netty-transport-native-epoll/4.1.74.Final/jar/linux-x86_64</bundle>
         <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.74.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.1.74.Final</bundle>
-        <bundle>mvn:io.netty/netty-tcnative-classes/2.0.48.Final</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.74.Final/jar/linux-aarch_64</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/4.1.74.Final/jar/linux-x86_64</bundle>
     </feature>
 </features>