From 4f517d77a7c50354c259e62f6d5e8ff9f1cf85e7 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 31 Aug 2023 21:34:55 +0200
Subject: [PATCH] Fixup feature packaging

We have a number of upstream references which are not expressed
properly:
- the dependencies should be pulled through artifacts
- the features should use version ranges

This patch corrects all features to behave.

Change-Id: I08c264e09241069d5680e65bc4f49af069e3b177
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../pom.xml                                   | 13 ++++++++-
 .../src/main/feature/feature.xml              | 13 +++++++++
 .../odl-lispflowmapping-southbound/pom.xml    | 29 +++++++++++++++----
 .../src/main/feature/feature.xml              |  1 +
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml

diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 6ed7593d6..33db972da 100644
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -24,11 +24,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>6.0.2</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>odl-restconf</artifactId>
-      <version>6.0.2</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml
new file mode 100644
index 000000000..a323182c6
--- /dev/null
+++ b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+Copyright © 2023 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 INTERNAL
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-mappingservice">
+    <feature name="odl-lispflowmapping-mappingservice">
+        <feature version="[6,7)">odl-restconf</feature>
+    </feature>
+</features>
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index d0fcb1464..5ff3f9d88 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -24,18 +24,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>controller-artifacts</artifactId>
+        <version>8.0.1</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>6.0.2</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-restconf</artifactId>
-      <version>6.0.2</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>odl-mdsal-broker</artifactId>
-      <version>8.0.1</version>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index 1c00de49a..c436ceccd 100644
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -10,5 +10,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <feature name="odl-lispflowmapping-southbound">
         <feature version="[12,14)">odl-netty-4</feature>
         <feature version="[8,9)">odl-mdsal-broker</feature>
+        <feature version="[6,7)">odl-restconf</feature>
     </feature>
 </features>
-- 
2.36.6