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>

diff --git a/features/odl-genius-api/src/main/feature/feature.xml b/features/odl-genius-api/src/main/feature/feature.xml
index 706db25a5c2d8f0ab716fc3bd8c8cf8179f30813..46777bfacc009555c9aef2219c775832c9eb4aa0 100644 (file)
--- 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 (file)
index 0000000..fe7a562
--- /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 (file)
index 0000000..ea8bfe7
--- /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 e841dead1057ba011848c60bcc93550bfc6f01ac..58b5aa11b2e4b5bd97a0851945355374667a072a 100644 (file)
--- 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 26fb093a74a6ef5c4cdd6effb0d212f3feb774bf..713c60289bb27b8be17f2fab19b2ad8d75f3a3e7 100644 (file)
--- 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>