From 403d86e3810a3425c8282af4efe156a4960e0005 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 1 Feb 2021 17:17:50 +0100
Subject: [PATCH] Correct odl-infrautils-* dependencies

infrautils is an MRI project, the dependencies should use a range.
While we are in the area, remove dependencies which we are getting
transitively.

Change-Id: Iad6b26decb6f14571123b473c57fda25f82c0bb6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../odl-genius-api/src/main/feature/feature.xml    |  2 ++
 .../src/main/feature/feature.xml                   | 14 ++++++++++++++
 .../src/main/feature/feature.xml                   | 13 +++++++++++++
 features/odl-genius/pom.xml                        |  8 +-------
 features/odl-genius/src/main/feature/feature.xml   |  3 +++
 5 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 features/odl-genius-fcaps-application/src/main/feature/feature.xml
 create mode 100644 features/odl-genius-fcaps-framework/src/main/feature/feature.xml

diff --git a/features/odl-genius-api/src/main/feature/feature.xml b/features/odl-genius-api/src/main/feature/feature.xml
index 706db25a5..46777bfac 100644
--- a/features/odl-genius-api/src/main/feature/feature.xml
+++ b/features/odl-genius-api/src/main/feature/feature.xml
@@ -10,5 +10,7 @@
     <feature name="odl-genius-api">
         <feature version="[8.1,9)">odl-apache-commons-net</feature>
         <feature version="[7,8)">odl-mdsal-model-rfc7224</feature>
+        <feature version="[1.9,2)">odl-infrautils-caches</feature>
+        <feature version="[1.9,2)">odl-infrautils-jobcoordinator</feature>
     </feature>
 </features>
diff --git a/features/odl-genius-fcaps-application/src/main/feature/feature.xml b/features/odl-genius-fcaps-application/src/main/feature/feature.xml
new file mode 100644
index 000000000..fe7a5620e
--- /dev/null
+++ b/features/odl-genius-fcaps-application/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Copyright © 2021 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-genius-fcaps-application">
+    <feature name="odl-genius-fcaps-application">
+        <feature version="[1.9,2)">odl-infrautils-inject</feature>
+        <feature version="[1.9,2)">odl-infrautils-metrics</feature>
+    </feature>
+</features>
diff --git a/features/odl-genius-fcaps-framework/src/main/feature/feature.xml b/features/odl-genius-fcaps-framework/src/main/feature/feature.xml
new file mode 100644
index 000000000..ea8bfe73f
--- /dev/null
+++ b/features/odl-genius-fcaps-framework/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Copyright © 2021 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-genius-fcaps-framework">
+    <feature name="odl-genius-fcaps-framework">
+        <feature version="[1.9,2)">odl-infrautils-utils</feature>
+    </feature>
+</features>
diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index e841dead1..58b5aa11b 100644
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -132,12 +132,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>odl-infrautils-metrics</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-inject</artifactId>
@@ -146,7 +140,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>odl-infrautils-jobcoordinator</artifactId>
+      <artifactId>odl-infrautils-metrics</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-genius/src/main/feature/feature.xml b/features/odl-genius/src/main/feature/feature.xml
index 26fb093a7..713c60289 100644
--- a/features/odl-genius/src/main/feature/feature.xml
+++ b/features/odl-genius/src/main/feature/feature.xml
@@ -8,5 +8,8 @@
       finalname="etc/opendaylight/datastore/initial/config/genius-itm-config.xml">mvn:org.opendaylight.genius/itm-impl/${project.version}/xml/config</configfile>
     <configfile
       finalname="etc/opendaylight/datastore/initial/config/genius-ifm-config.xml">mvn:org.opendaylight.genius/interfacemanager-impl/${project.version}/xml/config</configfile>
+    <feature version="[1.9,2)">odl-infrautils-diagstatus</feature>
+    <feature version="[1.9,2)">odl-infrautils-inject</feature>
+    <feature version="[1.9,2)">odl-infrautils-metrics</feature>
   </feature>
 </features>
-- 
2.36.6