From 1426d0f8b80e89dbfc8af5ec54092e70ed468f23 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 10 May 2024 14:55:18 +0200
Subject: [PATCH] Make Netty-3 dependency optional

Akka is using an long-obsolete version of Netty in for classic remoting.
While this is not a real problem by default, as the user needs to
configure it for the classes to be loaded, it is tripping up static
analysis tools.

This patch makes the org.jboss.netty.* import optional and removes our
packaging of Netty-3. This means that Akka Classic Remoting cannot be
configured unless the user also packages Netty-3 themselves.

JIRA: CONTROLLER-2119
Change-Id: I0a1bf611f140f2d5b6b83700893d0d69a3ba6115
Signed-off-by: Peter Suna <peter.suna@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit dca4c9dbd4c4d257d254350e817d7b61d3e67e1f)
---
 akka/repackaged-akka/pom.xml                                | 6 +-----
 .../odl-controller-akka/src/main/history/dependencies.xml   | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/akka/repackaged-akka/pom.xml b/akka/repackaged-akka/pom.xml
index f475e40a44..e46be857bc 100644
--- a/akka/repackaged-akka/pom.xml
+++ b/akka/repackaged-akka/pom.xml
@@ -54,11 +54,6 @@
             <groupId>io.aeron</groupId>
             <artifactId>aeron-driver</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-            <version>3.10.6.Final</version>
-        </dependency>
         <dependency>
             <groupId>org.agrona</groupId>
             <artifactId>agrona</artifactId>
@@ -223,6 +218,7 @@
                             org.fusesource.leveldbjni;resolution:=optional,
                             org.iq80.leveldb;resolution:=optional,
                             org.iq80.leveldb.impl;resolution:=optional,
+                            org.jboss.netty.*;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
diff --git a/features/odl-controller-akka/src/main/history/dependencies.xml b/features/odl-controller-akka/src/main/history/dependencies.xml
index 4e7493fb0b..05a9908e35 100644
--- a/features/odl-controller-akka/src/main/history/dependencies.xml
+++ b/features/odl-controller-akka/src/main/history/dependencies.xml
@@ -6,7 +6,6 @@
         <bundle>mvn:com.typesafe/ssl-config-core_2.13/0.4.3</bundle>
         <bundle>mvn:io.aeron/aeron-client/1.38.1</bundle>
         <bundle>mvn:io.aeron/aeron-driver/1.38.1</bundle>
-        <bundle>mvn:io.netty/netty/3.10.6.Final</bundle>
         <bundle>mvn:org.agrona/agrona/1.15.2</bundle>
         <bundle>mvn:org.opendaylight.controller/repackaged-akka/${project.version}</bundle>
         <bundle>mvn:org.reactivestreams/reactive-streams/1.0.4</bundle>
-- 
2.36.6