From bb6515cd50e23ac1acef0b1124500896110b6ef6 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Jun 2020 09:26:05 +0200
Subject: [PATCH] Clean up MRI feature references

We should be referring to MRI features through ranges, fix that.

Change-Id: I95775fea5b5469086b0020d224501e5fe2172033
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../src/main/feature/feature.xml                   | 13 +++++++++++++
 .../odl-lispflowmapping-mappingservice/pom.xml     |  7 -------
 features/odl-lispflowmapping-models/pom.xml        |  6 ++++++
 .../src/main/feature/feature.xml                   | 14 ++++++++++++++
 .../src/main/feature/feature.xml                   | 14 ++++++++++++++
 features/odl-lispflowmapping-southbound/pom.xml    |  6 ------
 .../src/main/feature/feature.xml                   |  2 +-
 7 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
 create mode 100644 features/odl-lispflowmapping-models/src/main/feature/feature.xml
 create mode 100644 features/odl-lispflowmapping-neutron/src/main/feature/feature.xml

diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
new file mode 100644
index 000000000..3977cb49d
--- /dev/null
+++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+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 INTERNAL
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-inmemorydb">
+    <feature name="odl-lispflowmapping-inmemorydb">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 531e03ed6..1bb50976e 100644
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -32,13 +32,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>odl-mdsal-broker</artifactId>
-      <version>2.0.2</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-lispflowmapping-models</artifactId>
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index f1a0144d7..00d07a447 100644
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/pom.xml
@@ -37,6 +37,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odl-apache-commons-lang3</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>odl-mdsal-model-rfc6991</artifactId>
diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
new file mode 100644
index 000000000..06482efce
--- /dev/null
+++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+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 INTERNAL
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-models">
+    <feature name="odl-lispflowmapping-models">
+        <feature version="[7,8)">odl-apache-commons-lang3</feature>
+        <feature version="[6,7)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-lispflowmapping-neutron/src/main/feature/feature.xml b/features/odl-lispflowmapping-neutron/src/main/feature/feature.xml
new file mode 100644
index 000000000..46df22e5e
--- /dev/null
+++ b/features/odl-lispflowmapping-neutron/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+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 INTERNAL
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-neutron">
+    <feature name="odl-lispflowmapping-neutron">
+        <feature version="[6,7)">odl-mdsal-model-rfc7224</feature>
+        <feature version="[6,7)">odl-mdsal-model-rfc7277</feature>
+    </feature>
+</features>
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 79a4ade82..1b4222456 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -45,12 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>odl-guava</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-lispflowmapping-models</artifactId>
diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index 9dde01ee3..5f331014a 100644
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -9,6 +9,6 @@ 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-southbound">
     <feature name="odl-lispflowmapping-southbound">
         <feature version="[7,8)">odl-netty-4</feature>
-        <feature version="[7,8)">odl-guava</feature>
+        <feature version="[2,3)">odl-mdsal-broker</feature>
     </feature>
 </features>
-- 
2.36.6