From ed83c916760530ceb15b6f0bdf3b6b39933ca200 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Jun 2020 08:28:16 +0200
Subject: [PATCH] Fix up feature packaging

We have a number of bundles packaged multiple times, fix that up
by providing proper references.

Change-Id: I0488fefbeaab3760eca7daf93ddd9d335713f285
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/netconf/odl-netconf-api/pom.xml       |  6 ++++++
 .../src/main/feature/feature.xml               |  1 +
 features/netconf/odl-netconf-impl/pom.xml      | 18 ++++++++++++++++++
 .../src/main/feature/feature.xml               | 13 +++++++++++++
 .../restconf/odl-restconf-nb-bierman02/pom.xml |  6 ++++++
 5 files changed, 44 insertions(+)
 create mode 100644 features/netconf/odl-netconf-impl/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 79f28d1707..b96f67cc12 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -68,6 +68,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8525</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>odl-mdsal-model-rfc8342</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 e8c1eeb2d6..b8d98e6b0a 100644
--- a/features/netconf/odl-netconf-api/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -11,6 +11,7 @@
         <feature version="[7,8)">odl-netty-4</feature>
         <feature version="[5,6)">odl-yangtools-parser-api</feature>
         <feature version="[6,7)">odl-mdsal-model-rfc7895</feature>
+        <feature version="[6,7)">odl-mdsal-model-rfc8525</feature>
         <feature version="[6,7)">odl-mdsal-model-rfc8342</feature>
     </feature>
 </features>
diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml
index bad7b6bb50..3faead2d1d 100644
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/netconf/odl-netconf-impl/pom.xml
@@ -23,7 +23,25 @@
 
     <name>OpenDaylight :: Netconf :: Impl</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>controller-artifacts</artifactId>
+                <version>2.0.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-exp-netty-config</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-api</artifactId>
diff --git a/features/netconf/odl-netconf-impl/src/main/feature/feature.xml b/features/netconf/odl-netconf-impl/src/main/feature/feature.xml
new file mode 100644
index 0000000000..a83f511f95
--- /dev/null
+++ b/features/netconf/odl-netconf-impl/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2020 PANTHEON.tech, s.r.o. and others.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-impl-${project.version}">
+    <feature name="odl-netconf-impl" version="${project.version}">
+        <feature version="[2,3)">odl-controller-exp-netty-config</feature>
+    </feature>
+</features>
diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml
index dbfad396ae..5b33521ba8 100644
--- a/features/restconf/odl-restconf-nb-bierman02/pom.xml
+++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml
@@ -43,6 +43,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-mapping-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf-common</artifactId>
-- 
2.36.6