From afcef57d3592db2e186ace7b0cb2b2335edaaa62 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 2 Apr 2021 07:32:23 +0200
Subject: [PATCH] Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.1
- infrautils-1.9.6
- yangtools-6.0.5
- mdsal-7.0.6
- controller-3.0.7
- aaa-0.13.2
- netconf-1.13.1

Also switch to using bgpcep-0.15.0 as a preparation for Phosphorus MRI.

Change-Id: Ibd533e316032401b4841badc9d50dc5ebbc71ef1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/all/pom.xml                          |  2 +-
 artifacts/distribution/pom.xml                 |  2 +-
 artifacts/pom.xml                              |  2 +-
 artifacts/upstream/all/pom.xml                 |  2 +-
 artifacts/upstream/pom.xml                     |  2 +-
 artifacts/upstream/properties/pom.xml          | 18 +++++++++---------
 features/pom.xml                               |  2 +-
 features/repos/index/pom.xml                   |  2 +-
 features/repos/pom.xml                         |  2 +-
 features/repos/test/pom.xml                    |  2 +-
 features/singles/odl-integration-all/pom.xml   |  2 +-
 .../pom.xml                                    |  2 +-
 features/singles/pom.xml                       |  2 +-
 karaf-scripts/pom.xml                          |  2 +-
 karaf/pom.xml                                  |  2 +-
 onap-karaf/pom.xml                             |  2 +-
 pom.xml                                        |  2 +-
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 83faaa09..6ac6350b 100644
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.0</version>
+      <version>8.1.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index e9709ec7..bae43d03 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.0</version>
+      <version>8.1.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ffbce700..22bea6b4 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 1d0e598c..31a9bc6d 100644
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.0</version>
+      <version>8.1.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 56245d25..2918dcd2 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.0</version>
+      <version>8.1.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 4f5e2455..0ec1c57a 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -43,21 +43,21 @@
     <properties>
         <!-- Version properties by project or component. -->
         <!-- Keep this list sorted alphabetically please. -->
-        <aaa.version>0.13.1</aaa.version>
-        <bgpcep.version>0.16.0-SNAPSHOT</bgpcep.version>
-        <controller.version>3.0.6</controller.version>
+        <aaa.version>0.13.2</aaa.version>
+        <bgpcep.version>0.15.0</bgpcep.version>
+        <controller.version>3.0.7</controller.version>
         <daexim.version>1.10.0-SNAPSHOT</daexim.version>
-        <infrautils.version>1.9.5</infrautils.version>
+        <infrautils.version>1.9.6</infrautils.version>
         <jsonrpc.version>1.11.0-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.14.0-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>7.0.5</mdsal.version>
-        <netconf.version>1.13.0</netconf.version>
+        <mdsal.version>7.0.6</mdsal.version>
+        <netconf.version>1.13.1</netconf.version>
         <neutron.version>0.17.0-SNAPSHOT</neutron.version>
-        <odlparent.version>8.1.0</odlparent.version>
+        <odlparent.version>8.1.1</odlparent.version>
         <openflowplugin.version>0.13.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.13.0-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.8.0-SNAPSHOT</serviceutils.version>
-        <yangtools.version>6.0.4</yangtools.version>
+        <yangtools.version>6.0.5</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 0e982c5e..9c7c131e 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 0fde3dda..793127f0 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 0b6dfcbb..19207327 100644
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 535c0c46..22e334e0 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index c163332e..1d88cee1 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 54875af5..15c96858 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index c114f288..7128c3f8 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index 2208a4c6..d7c5f202 100644
--- a/karaf-scripts/pom.xml
+++ b/karaf-scripts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index ef723a0e..12d9851a 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 086e6386..7c7111c0 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index b3c9f812..2093465f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.0</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6