From b2ddabbbdc758576fb98076df661f9956e4ef56d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 21 Oct 2021 12:52:10 +0200
Subject: [PATCH] Bump MRI upstreams

Adopt:
- odlparent-9.0.7
- yangtools-7.0.9
- mdsal-8.0.6
- controller-4.0.4
- infrautils-2.0.7
- aaa-0.14.4

Change-Id: I58a167c02bc8e09465534859242661a8f2ee77c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                         | 2 +-
 .../netconf-connector/features-netconf-connector/pom.xml  | 2 +-
 features/netconf-connector/pom.xml                        | 2 +-
 features/netconf/features-netconf-testing/pom.xml         | 2 +-
 features/netconf/features-netconf/pom.xml                 | 2 +-
 features/netconf/pom.xml                                  | 2 +-
 features/parent/pom.xml                                   | 2 +-
 features/pom.xml                                          | 2 +-
 features/restconf/features-restconf/pom.xml               | 2 +-
 features/restconf/pom.xml                                 | 2 +-
 features/yanglib/features-yanglib/pom.xml                 | 2 +-
 features/yanglib/pom.xml                                  | 2 +-
 karaf-static/pom.xml                                      | 2 +-
 karaf/pom.xml                                             | 6 +++---
 netconf/models/pom.xml                                    | 2 +-
 netconf/netconf-config/pom.xml                            | 2 +-
 netconf/pom.xml                                           | 2 +-
 netconf/shaded-exificient-jar/pom.xml                     | 2 +-
 netconf/shaded-exificient/pom.xml                         | 2 +-
 netconf/shaded-sshd-jar/pom.xml                           | 2 +-
 netconf/shaded-sshd/pom.xml                               | 2 +-
 netconf/tools/pom.xml                                     | 2 +-
 parent/pom.xml                                            | 8 ++++----
 pom.xml                                                   | 2 +-
 restconf/pom.xml                                          | 2 +-
 restconf/restconf-models/pom.xml                          | 2 +-
 .../sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java     | 8 ++++----
 restconf/sal-rest-connector-config/pom.xml                | 2 +-
 28 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 085a8535ef..e55a504d8a 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.6</version>
+      <version>9.0.7</version>
       <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index b18a183ec4..ee640e0118 100644
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 66d774811a..0e25aee422 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index 6c591fbf7e..a9e878d77d 100644
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -12,7 +12,7 @@
   <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>feature-repo-parent</artifactId>
-      <version>9.0.6</version>
+      <version>9.0.7</version>
       <relativePath/>
   </parent>
 
diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 370d1b3718..7ed01f6789 100644
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5ea3a78388..2aae6eef56 100644
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 61d2f12cfc..48de63d8e5 100644
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 4b03267ad9..7e03348894 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index d6b4474fd2..ea86baeaf3 100644
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index f317fcd745..930afc07ae 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index 769099b224..6e57e78694 100644
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index c7936b773d..986a76693a 100644
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index f4598e145e..ac923d6ee0 100644
--- a/karaf-static/pom.xml
+++ b/karaf-static/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-dist-static</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index b11c08226d..d8f797a147 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index ace506e986..516035c5ad 100644
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index a7a2455b94..bb5fdb92a5 100644
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/pom.xml b/netconf/pom.xml
index a90737ecb5..b48561b9ad 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index f40490dde4..1fb6b7aef9 100644
--- a/netconf/shaded-exificient-jar/pom.xml
+++ b/netconf/shaded-exificient-jar/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 99843218d1..24cbe92f85 100644
--- a/netconf/shaded-exificient/pom.xml
+++ b/netconf/shaded-exificient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index f5ae1ed3b9..acaae72ba0 100644
--- a/netconf/shaded-sshd-jar/pom.xml
+++ b/netconf/shaded-sshd-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index 57c732b4c3..920a53005a 100644
--- a/netconf/shaded-sshd/pom.xml
+++ b/netconf/shaded-sshd/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index cf38d013ac..23ff60aec4 100644
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index a478521e0d..3d2d8e3b1c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.14.3</version>
+        <version>0.14.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/pom.xml b/pom.xml
index e50c5fad02..46a4dca337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/pom.xml b/restconf/pom.xml
index 4deab342ae..4e53be40a1 100644
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index ab25fe57b5..1fc55db91e 100644
--- a/restconf/restconf-models/pom.xml
+++ b/restconf/restconf-models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index b847a053da..ac0ee801db 100644
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -54,7 +54,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
     public NnToXmlTest() {
         super(schemaContext, null);
-        this.xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
+        xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
     }
 
     @BeforeClass
@@ -97,8 +97,8 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
             "<not-existing>value</not-existing>", "<lfLfrefNegative>value</lfLfrefnegative>"));
         final Throwable rootCause = Throwables.getRootCause(ex);
         assertThat(rootCause, instanceOf(IllegalArgumentException.class));
-        assertEquals("Data tree child (basic:module?revision=2013-12-02)not-existing not present",
-            rootCause.getMessage());
+        assertEquals("Data tree child (basic:module?revision=2013-12-02)not-existing not present in schema parent "
+            + "(basic:module?revision=2013-12-02)cont", rootCause.getMessage());
     }
 
     @Test
@@ -313,7 +313,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     private void nnToXml(final NormalizedNodeContext normalizedNodeContext, final String... xmlRepresentation)
             throws Exception {
         final OutputStream output = new ByteArrayOutputStream();
-        this.xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, this.mediaType, null, output);
+        xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, mediaType, null, output);
 
         for (String element : xmlRepresentation) {
             assertTrue(output.toString().contains(element));
diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index db9f163f77..4bf3e47187 100644
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 
-- 
2.36.6