From e638a3874673c663a775d5f0c14d6733765f4336 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 24 Jul 2020 17:54:08 +0200
Subject: [PATCH] Adjust distribution for infrautils being MRI

There are a couple of things that are done here:
- use stable/experimental features just like everybody else
- list version in platform-versions
- take odl-infrautils-ready of of odl-integration-compatible-with-all

Change-Id: Iffab0e36185741144ad61f6a09ec15d3dfc57918
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/upstream/properties/pom.xml             |  2 +-
 docs/platform-versions.rst                        |  4 ++++
 features/repos/index/pom.xml                      |  8 +++++++-
 .../odl-integration-compatible-with-all/pom.xml   | 15 ---------------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 038df19e..667f6f66 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -48,7 +48,7 @@
         <controller.version>2.0.3</controller.version>
         <daexim.version>1.8.0-SNAPSHOT</daexim.version>
         <genius.version>0.9.0-SNAPSHOT</genius.version>
-        <infrautils.version>1.8.0-SNAPSHOT</infrautils.version>
+        <infrautils.version>1.8.0</infrautils.version>
         <jsonrpc.version>1.9.0-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.12.0-SNAPSHOT</lispflowmapping.version>
         <mdsal.version>6.0.4</mdsal.version>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index b4e22381..572dbc20 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -15,6 +15,10 @@ Platform versions
      - \*
      - 7.0.5
 
+   * - org.opendaylight.infrautils
+     - \*
+     - 1.8.0
+
    * - org.opendaylight.yangtools
      - \*
      - 5.0.5
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 6ef17417..d5e8b6f7 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -184,7 +184,13 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.infrautils</groupId>
-                    <artifactId>infrautils-features</artifactId>
+                    <artifactId>features-infrautils</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.infrautils</groupId>
+                    <artifactId>features-infrautils-experimental</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 03c8d0e9..77fdb57e 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -114,21 +114,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- InfraUtils -->
-        <profile>
-            <id>infrautils</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.infrautils</groupId>
-                    <artifactId>odl-infrautils-ready</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- jsonrpc -->
         <profile>
             <id>jsonrpc</id>
-- 
2.36.6