From 5b3bbd2287f6f5c583c73130d442486ee511454f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 12 May 2022 16:23:19 +0200
Subject: [PATCH] Bump upstream versions

Adopt:
- odlparent-10.0.2
- infrautils-3.0.1
- yangtools-8.0.5
- mdsal-9.0.3
- controller-5.0.5
- aaa-0.15.4

Change-Id: I9d78b5a9538801854910a0621a9ebab60fac0414
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 8030cefc9a73619d4a06ff0e5251b3817650cba1)
---
 artifacts/pom.xml                                |  2 +-
 .../features-netconf-connector/pom.xml           |  2 +-
 features/netconf-connector/pom.xml               |  2 +-
 .../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/odl-mdsal-apidocs/pom.xml      |  2 +-
 .../src/main/feature/feature.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/netconf-testtool/pom.xml           | 16 ++++++++--------
 netconf/tools/pom.xml                            |  2 +-
 parent/pom.xml                                   |  8 ++++----
 pom.xml                                          |  2 +-
 restconf/pom.xml                                 |  2 +-
 restconf/restconf-models/pom.xml                 |  2 +-
 restconf/restconf-nb-rfc8040/pom.xml             |  5 +++++
 restconf/sal-rest-connector-config/pom.xml       |  2 +-
 31 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a98b70ff7b..579479d0b9 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>10.0.0</version>
+      <version>10.0.2</version>
       <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 8aebcb29fe..b53e335e82 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index dd317b154a..578dcdfa6e 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index ac5a12c19c..1e578fd7de 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>10.0.0</version>
+      <version>10.0.2</version>
       <relativePath/>
   </parent>
 
diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index a4a6eccdb6..afe5dac501 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 72438e1dc5..80bcb12bc0 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 212864108a..391b70663d 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 00b133f6fb..c187a77348 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 76df5d30c2..f00e3f7304 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml
index 0ce9f6433e..c3dba71247 100644
--- a/features/restconf/odl-mdsal-apidocs/pom.xml
+++ b/features/restconf/odl-mdsal-apidocs/pom.xml
@@ -23,7 +23,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-jackson-2.12</artifactId>
+            <artifactId>odl-jackson-2.13</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
index 01c4bfa6ab..8ecc61262b 100644
--- a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
+++ b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-mdsal-apidocs" version="${project.version}">
-        <feature version="[10,11)">odl-jackson-2.12</feature>
+        <feature version="[10,11)">odl-jackson-2.13</feature>
     </feature>
 </features>
diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index fb8ce05285..64eba9444f 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index f0226e7174..aa7b33ffee 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index c95fd71eff..0fec13b615 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index 18025de5fc..1e10f203a8 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7ac10ab352..aa62a6c37d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>5.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>3.0.0</version>
+        <version>3.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index e0480a8a84..417c7d535f 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index e2eea1b6fc..6a7b8e6b64 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/pom.xml b/netconf/pom.xml
index fb37603c94..c5ee48fd1f 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index 50c61e4d67..c1bd09aca0 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 3937f5dbcb..248cbb197a 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index e9087aafc6..598b908d92 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index 413e2721bc..f7233cab00 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 836e968586..a6e455a997 100644
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -44,11 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -157,17 +157,17 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                    <artifactId>bcpkix-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcpkix-jdk15on.jar</destFileName>
+                                    <destFileName>bcpkix-jdk18on.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcprov-jdk15on</artifactId>
+                                    <artifactId>bcprov-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcprov-jdk15on.jar</destFileName>
+                                    <destFileName>bcprov-jdk18on.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -243,7 +243,7 @@
                                           implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                       <manifestEntries>
                                           <Main-Class>org.opendaylight.netconf.test.tool.client.stress.StressClient</Main-Class>
-                                          <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                          <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                       </manifestEntries>
                                   </transformer>
                               </transformers>
@@ -318,7 +318,7 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
-                                        <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                        <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 6024f24b16..c4fcb17757 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index d3803049d1..014c08a462 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.2</version>
+    <version>9.0.3</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.15.3</version>
+        <version>0.15.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 42c6e3b466..e75425c37c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/pom.xml b/restconf/pom.xml
index 523d6e27e1..7cfdc455c9 100644
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index a20d8f675a..e1e806c925 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index d582fc36b8..2d4e67d3e8 100644
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -190,6 +190,11 @@
       <artifactId>threadpool-config-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-assertj</artifactId>
diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index cafcb034fe..4b671975ab 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
-- 
2.36.6