From 267e02b440b794bbbb6e31579a9a8ea2508e4d51 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 7 Jun 2021 16:59:53 +0200
Subject: [PATCH] Bump MRI upstreams

Adopt latest versions, namely;
- odlparent-9.0.2
- yangtools-7.0.3
- infrautils-2.0.2
- mdsal-8.0.0
- controller-4.0.0

Change-Id: I6cac0995eead2e27494a7e5f44feaa847b238a3b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                         | 2 +-
 commons/binding-parent/pom.xml                            | 4 ++--
 commons/pom.xml                                           | 2 +-
 commons/quality-parent/pom.xml                            | 8 ++++----
 features/odl-serviceutils-listener/pom.xml                | 6 +++---
 .../src/main/feature/feature.xml                          | 4 ++--
 features/odl-serviceutils-rpc/pom.xml                     | 6 +++---
 .../odl-serviceutils-rpc/src/main/feature/feature.xml     | 4 ++--
 features/odl-serviceutils-srm/pom.xml                     | 2 +-
 features/odl-serviceutils-tools/pom.xml                   | 6 +++---
 .../odl-serviceutils-tools/src/main/feature/feature.xml   | 4 ++--
 features/pom.xml                                          | 2 +-
 features/serviceutils-features/pom.xml                    | 2 +-
 karaf/pom.xml                                             | 2 +-
 pom.xml                                                   | 2 +-
 srm/pom.xml                                               | 2 +-
 tools/pom.xml                                             | 2 +-
 upgrade/pom.xml                                           | 2 +-
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index df4221de..efd33212 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 2047bf82..bccfd991 100644
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.7</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/commons/pom.xml b/commons/pom.xml
index d69ed929..3514fca8 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml
index 54838f95..5df6f717 100644
--- a/commons/quality-parent/pom.xml
+++ b/commons/quality-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.infrautils</groupId>
     <artifactId>parent</artifactId>
-    <version>1.9.6</version>
+    <version>2.0.2</version>
     <relativePath/>
   </parent>
 
@@ -22,21 +22,21 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.7</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-serviceutils-listener/pom.xml b/features/odl-serviceutils-listener/pom.xml
index c8454185..476a2c61 100644
--- a/features/odl-serviceutils-listener/pom.xml
+++ b/features/odl-serviceutils-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 
@@ -20,14 +20,14 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.6</version>
+                <version>2.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>7.0.6</version>
+                <version>8.0.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/features/odl-serviceutils-listener/src/main/feature/feature.xml b/features/odl-serviceutils-listener/src/main/feature/feature.xml
index 9adaae1a..5fad0b2d 100644
--- a/features/odl-serviceutils-listener/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-listener/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <feature name='odl-serviceutils-listener' version='${project.version}'>
-    <feature version="[7,8)">odl-mdsal-binding-api</feature>
-    <feature version="[1.9,2)">odl-infrautils-metrics</feature>
+    <feature version="[8,9)">odl-mdsal-binding-api</feature>
+    <feature version="[2,3)">odl-infrautils-metrics</feature>
   </feature>
 </features>
diff --git a/features/odl-serviceutils-rpc/pom.xml b/features/odl-serviceutils-rpc/pom.xml
index 40ac4680..aecda4be 100644
--- a/features/odl-serviceutils-rpc/pom.xml
+++ b/features/odl-serviceutils-rpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.6</version>
+                <version>2.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>7.0.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/odl-serviceutils-rpc/src/main/feature/feature.xml b/features/odl-serviceutils-rpc/src/main/feature/feature.xml
index ce407645..8935189d 100644
--- a/features/odl-serviceutils-rpc/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-rpc/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <feature name='odl-serviceutils-rpc' version='${project.version}'>
-    <feature version="[6,7)">odl-yangtools-common</feature>
-    <feature version="[1.9,2)">odl-infrautils-utils</feature>
+    <feature version="[7,8)">odl-yangtools-common</feature>
+    <feature version="[2,3)">odl-infrautils-utils</feature>
   </feature>
 </features>
diff --git a/features/odl-serviceutils-srm/pom.xml b/features/odl-serviceutils-srm/pom.xml
index f3567ee9..03dc1cd6 100644
--- a/features/odl-serviceutils-srm/pom.xml
+++ b/features/odl-serviceutils-srm/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-serviceutils-tools/pom.xml b/features/odl-serviceutils-tools/pom.xml
index 40d45350..94e9e9da 100644
--- a/features/odl-serviceutils-tools/pom.xml
+++ b/features/odl-serviceutils-tools/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.6</version>
+        <version>2.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>controller-artifacts</artifactId>
-          <version>3.0.7</version>
+          <version>4.0.0</version>
           <type>pom</type>
           <scope>import</scope>
       </dependency>
diff --git a/features/odl-serviceutils-tools/src/main/feature/feature.xml b/features/odl-serviceutils-tools/src/main/feature/feature.xml
index 2997713b..3b624701 100644
--- a/features/odl-serviceutils-tools/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-tools/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   <feature name='odl-serviceutils-tools' version='${project.version}'>
     <configfile
       finalname="etc/opendaylight/datastore/initial/config/serviceutils-upgrade-config.xml">mvn:org.opendaylight.serviceutils/upgrade/${project.version}/xml/config</configfile>
-    <feature version="[3,4)">odl-mdsal-broker</feature>
-    <feature version="[1.9,2)">odl-infrautils-metrics</feature>
+    <feature version="[4,5)">odl-mdsal-broker</feature>
+    <feature version="[2,3)">odl-infrautils-metrics</feature>
   </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 60d33a1f..75f02341 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features/serviceutils-features/pom.xml b/features/serviceutils-features/pom.xml
index 56fe54f4..92dd3a56 100644
--- a/features/serviceutils-features/pom.xml
+++ b/features/serviceutils-features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9d282eff..c0fc394d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 213c9751..8af243cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/srm/pom.xml b/srm/pom.xml
index 32d1ae6c..9628bd03 100644
--- a/srm/pom.xml
+++ b/srm/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index e41162cb..cbf4f4fc 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/upgrade/pom.xml b/upgrade/pom.xml
index 9b681a45..dffb45a6 100644
--- a/upgrade/pom.xml
+++ b/upgrade/pom.xml
@@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>
-      <version>7.0.6</version>
+      <version>8.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
-- 
2.36.6