From bfed8ea9683a3a11cacfbcdfa79c5b05c885525e Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 22 Sep 2020 17:48:53 +0200
Subject: [PATCH] Bump MRI projects

This patch adopts:
- odlparent-7.0.6
- infrautils-1.8.1
- yangtools-5.0.6
- mdsal-6.0.5
- controller-2.0.4

Change-Id: I8825415a2c7526693caf3a73a3e0a08776af1d08
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                         | 2 +-
 commons/parent/pom.xml                                    | 8 ++++----
 features/features-lispflowmapping/pom.xml                 | 2 +-
 features/odl-lispflowmapping-inmemorydb/pom.xml           | 4 ++--
 features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +-
 features/odl-lispflowmapping-mappingservice/pom.xml       | 2 +-
 features/odl-lispflowmapping-models/pom.xml               | 4 ++--
 features/odl-lispflowmapping-msmr/pom.xml                 | 2 +-
 features/odl-lispflowmapping-neutron/pom.xml              | 4 ++--
 features/odl-lispflowmapping-southbound/pom.xml           | 4 ++--
 features/pom.xml                                          | 2 +-
 integrationtest/pom.xml                                   | 2 +-
 lispflowmapping-karaf/pom.xml                             | 2 +-
 mappingservice/api/pom.xml                                | 2 +-
 mappingservice/lisp-proto/pom.xml                         | 2 +-
 mappingservice/neutron/pom.xml                            | 4 ++--
 mappingservice/pom.xml                                    | 4 ++--
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 17a5f82d2..c564e5740 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 5984a9d35..ce67ecc70 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
   <properties>
-    <branding.version>2.0.3</branding.version>
+    <branding.version>2.0.4</branding.version>
     <build.suffix>1.0.0</build.suffix>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
     <lispflowmapping.version>1.13.0-SNAPSHOT</lispflowmapping.version>
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
@@ -70,7 +70,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index ed3f62e13..4c50e563d 100644
--- a/features/features-lispflowmapping/pom.xml
+++ b/features/features-lispflowmapping/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 4eb39b1a1..b19ece843 100644
--- a/features/odl-lispflowmapping-inmemorydb/pom.xml
+++ b/features/odl-lispflowmapping-inmemorydb/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>odl-mdsal-broker</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 6fb4104ad..0f51db473 100644
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index c7ca140ac..e5a7d9df5 100644
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index dd7b4f889..d44bb9eb7 100644
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index 4cf876bf7..be5afa282 100644
--- a/features/odl-lispflowmapping-msmr/pom.xml
+++ b/features/odl-lispflowmapping-msmr/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index 2398e0d97..11657421b 100644
--- a/features/odl-lispflowmapping-neutron/pom.xml
+++ b/features/odl-lispflowmapping-neutron/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 247bac63f..4e8c1679d 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -35,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>odl-mdsal-broker</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 9364de744..25c539e13 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 9e133192a..a6866d365 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index 2b9eccfe6..d938beb24 100644
--- a/lispflowmapping-karaf/pom.xml
+++ b/lispflowmapping-karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 0292cd71e..5274dd2a0 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.4</version>
+    <version>6.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 70d51bb76..da7298b22 100644
--- a/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.4</version>
+    <version>6.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 2699e4eb3..6e5308439 100644
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.4</version>
+    <version>6.0.5</version>
     <relativePath/>
   </parent>
 
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-singleton-common-api</artifactId>
-      <version>6.0.4</version>
+      <version>6.0.5</version>
     </dependency>
 
     <!--Needed for testing-->
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 83489f4fd..d6878c55b 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6