From 4e04783763f9509ccb94c565b71e2420fde1b024 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 10 Jan 2022 14:21:46 +0100
Subject: [PATCH] Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.6
- infrautils-1.9.12
- yangtools-6.0.10
- mdsal-7.0.12
- controller-3.0.14
- aaa-0.13.9
- netconf-1.13.6

Change-Id: Ie39e39ce5dc4c90fc517c1c490b3bafaaa7071f7
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            | 16 ++++++++--------
 docs/platform-versions.rst                       | 10 +++++++++-
 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 +-
 .../odl-integration-compatible-with-all/pom.xml  |  2 +-
 features/singles/pom.xml                         |  2 +-
 karaf-scripts/pom.xml                            |  2 +-
 karaf/pom.xml                                    |  2 +-
 onap-karaf/pom.xml                               |  2 +-
 opendaylight/karaf/pom.xml                       |  2 +-
 pom.xml                                          |  2 +-
 19 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 6a70fcc2..784c6478 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.4</version>
+      <version>8.1.6</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 6bee5ee2..b742b56c 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.4</version>
+      <version>8.1.6</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index db42e1eb..ac420e5f 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index df68e7d5..40e0199e 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.4</version>
+      <version>8.1.6</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index a76ef6ed..2472114a 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.4</version>
+      <version>8.1.6</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 37f6f0e8..5328ad76 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.4</version>
+        <version>8.1.6</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.7</aaa.version>
+        <aaa.version>0.13.9</aaa.version>
         <bgpcep.version>0.15.4-SNAPSHOT</bgpcep.version>
-        <controller.version>3.0.12</controller.version>
+        <controller.version>3.0.14</controller.version>
         <daexim.version>1.9.4-SNAPSHOT</daexim.version>
-        <infrautils.version>1.9.10</infrautils.version>
+        <infrautils.version>1.9.12</infrautils.version>
         <jsonrpc.version>1.10.4-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.13.5-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>7.0.10</mdsal.version>
-        <netconf.version>1.13.5</netconf.version>
+        <mdsal.version>7.0.12</mdsal.version>
+        <netconf.version>1.13.6</netconf.version>
         <neutron.version>0.16.4-SNAPSHOT</neutron.version>
-        <odlparent.version>8.1.4</odlparent.version>
+        <odlparent.version>8.1.6</odlparent.version>
         <openflowplugin.version>0.12.4-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.12.4-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.7.4-SNAPSHOT</serviceutils.version>
-        <yangtools.version>6.0.8</yangtools.version>
+        <yangtools.version>6.0.10</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index c4d719b8..bc7b54c0 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -12,7 +12,8 @@ Platform versions
      - Silicon GA
      - Silicon SR1
      - Silicon SR2
-     - Silicon SR3 development
+     - Silicon SR3
+     - Silicon SR4 development
 
    * - org.opendaylight.odlparent
      - \*
@@ -20,6 +21,7 @@ Platform versions
      - 8.1.2
      - 8.1.3
      - 8.1.4
+     - 8.1.6
 
    * - org.opendaylight.infrautils
      - \*
@@ -27,6 +29,7 @@ Platform versions
      - 1.9.8
      - 1.9.9
      - 1.9.10
+     - 1.9.12
 
    * - org.opendaylight.yangtools
      - \*
@@ -34,6 +37,7 @@ Platform versions
      - 6.0.6
      - 6.0.7
      - 6.0.8
+     - 6.0.10
 
    * - org.opendaylight.mdsal
      - \*
@@ -41,6 +45,7 @@ Platform versions
      - 7.0.7
      - 7.0.9
      - 7.0.10
+     - 7.0.12
 
    * - org.opendaylight.controller
      - \*
@@ -48,6 +53,7 @@ Platform versions
      - 3.0.8
      - 3.0.10
      - 3.0.12
+     - 3.0.14
 
    * - org.opendaylight.aaa
      - \*
@@ -55,6 +61,7 @@ Platform versions
      - 0.13.3
      - 0.13.5
      - 0.13.7
+     - 0.13.9
 
    * - org.opendaylight.netconf
      - \*
@@ -62,6 +69,7 @@ Platform versions
      - 1.13.2
      - 1.13.4
      - 1.13.5
+     - 1.13.6
 
 .. note:: Most projects get their YANG Tools version via MD-SAL.
   ${project}-artifacts are maven `bill of materials <https://howtodoinjava.com/maven/maven-bom-bill-of-materials-dependency/>`__
diff --git a/features/pom.xml b/features/pom.xml
index 2bbbff35..32cbbebf 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 09f0eea9..6576b6f8 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index a1ced3bd..db9390b5 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index c70f0603..6efd9de7 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.4</version>
+        <version>8.1.6</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 e5523482..02be157a 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.4</version>
+        <version>8.1.6</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 b6d32285..39f39c62 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 95dbd68d..7dfa5e26 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index 70ac63ee..ed5e6f1d 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 73f541b0..ebc85056 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index c3ab2c34..d630bdf2 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.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
 
diff --git a/opendaylight/karaf/pom.xml b/opendaylight/karaf/pom.xml
index c00f412f..85cdef72 100644
--- a/opendaylight/karaf/pom.xml
+++ b/opendaylight/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/pom.xml b/pom.xml
index 2b945459..61306fd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.4</version>
+        <version>8.1.6</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6