From 80a61f22e5e19cc3b4cabb2da3f56f3a96c6ce90 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 9 Jan 2019 12:43:36 +0100
Subject: [PATCH] Prevent duplicate netty packaging

With protocol-framework gone, odl-netty-api is missing
a dependency on odl-netty-4, preventing duplicates. Make sure
we have that in place.

Change-Id: I596502060610087e39d757db788ab715939963e5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/netconf/odl-netconf-api/pom.xml                    | 6 ++++++
 .../netconf/odl-netconf-api/src/main/feature/feature.xml    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 500bdb2292..cd1c830f11 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -50,6 +50,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-netty-4</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-parser-api</artifactId>
diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
index b23837d4d4..11e381a700 100644
--- a/features/netconf/odl-netconf-api/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -8,6 +8,7 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-netconf-api" version="${project.version}">
+        <feature version="[4,5)">odl-netty-4</feature>
         <feature version="[2.1,3)">odl-yangtools-parser-api</feature>
     </feature>
 </features>
-- 
2.36.6