From 211dacfed540c8ddbf552c229c74b6054b185720 Mon Sep 17 00:00:00 2001
From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Thu, 31 Mar 2022 09:22:21 +0200
Subject: [PATCH] Bump upstream dependencies to S-SR1

Adopt:
- odlparent-10.0.2
- yangtools-8.0.6
- mdsal-9.0.4
- netconf-3.0.5

Also,
- remove useless power-mock dependencies from olm and pce modules

JIRA: TRNSPRTPCE-648
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I64667a43343a18ceccdc58731c00d294a74f5826
---
 api/pom.xml                                   |  2 +-
 common/pom.xml                                |  4 ++--
 dmaap-client/pom.xml                          |  2 +-
 .../odl-transportpce-dmaap-client/pom.xml     |  2 +-
 features/odl-transportpce-inventory/pom.xml   |  2 +-
 .../odl-transportpce-nbinotifications/pom.xml |  2 +-
 features/odl-transportpce-swagger/pom.xml     |  4 ++--
 features/odl-transportpce-tapi/pom.xml        |  2 +-
 features/odl-transportpce/pom.xml             |  4 ++--
 features/pom.xml                              |  2 +-
 inventory/pom.xml                             |  2 +-
 karaf/pom.xml                                 |  2 +-
 nbinotifications/pom.xml                      |  2 +-
 networkmodel/pom.xml                          |  8 +++----
 olm/pom.xml                                   | 22 +------------------
 ordmodels/common/pom.xml                      |  2 +-
 ordmodels/device/pom.xml                      |  4 ++--
 ordmodels/network/pom.xml                     |  2 +-
 ordmodels/pom.xml                             |  2 +-
 ordmodels/service/pom.xml                     |  2 +-
 pce/pom.xml                                   | 17 +-------------
 pom.xml                                       |  2 +-
 renderer/pom.xml                              |  2 +-
 servicehandler/pom.xml                        |  2 +-
 tapi/pom.xml                                  |  4 ++--
 tapimodels/pom.xml                            |  2 +-
 test-common/pom.xml                           |  4 ++--
 27 files changed, 36 insertions(+), 71 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 7a8880035..6679bdc06 100644
--- a/api/pom.xml
+++ b/api/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index f2b043613..ba2466a13 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>2.0.16</version>
+        <version>3.0.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index e8e5d738e..9ff17cf4a 100644
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml
index 564d66090..785176e8a 100644
--- a/features/odl-transportpce-dmaap-client/pom.xml
+++ b/features/odl-transportpce-dmaap-client/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index 4e7ae226b..3df9d00b6 100644
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml
index df898c97c..74d8705ba 100644
--- a/features/odl-transportpce-nbinotifications/pom.xml
+++ b/features/odl-transportpce-nbinotifications/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce-swagger/pom.xml b/features/odl-transportpce-swagger/pom.xml
index 59e119b69..1c8b72b00 100644
--- a/features/odl-transportpce-swagger/pom.xml
+++ b/features/odl-transportpce-swagger/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce :: swagger</name>
 
   <properties>
-    <netconf.version>2.0.16</netconf.version>
+    <netconf.version>3.0.5</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml
index 49dd0d0bb..578fbf86d 100644
--- a/features/odl-transportpce-tapi/pom.xml
+++ b/features/odl-transportpce-tapi/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 229f9d2dc..e895e7503 100644
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce</name>
 
   <properties>
-    <netconf.version>2.0.16</netconf.version>
+    <netconf.version>3.0.5</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/pom.xml b/features/pom.xml
index f51e4ad51..c64df1e3e 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 INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/inventory/pom.xml b/inventory/pom.xml
index 177b54dbe..cda5af8b6 100644
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 988e34d28..a6fa8f91f 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml
index 4ddc4af73..c415d9888 100644
--- a/nbinotifications/pom.xml
+++ b/nbinotifications/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 248a9e69e..341f49b36 100644
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
@@ -27,21 +27,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>7.0.17</version>
+        <version>8.0.6</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>8.0.15</version>
+        <version>9.0.4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>2.0.13</version>
+        <version>3.0.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/olm/pom.xml b/olm/pom.xml
index a1ee52e8a..74a5a6437 100644
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -104,25 +104,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mdsal-binding-generator</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index c29b7e069..c72629f45 100644
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 9c8451c15..99469b592 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>2.0.16</version>
+        <version>3.0.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 87a290723..a5c1e0509 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 5f75a0190..cb7a5b21d 100644
--- a/ordmodels/pom.xml
+++ b/ordmodels/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 2f0f8f2a0..ee048bfce 100644
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/pce/pom.xml b/pce/pom.xml
index 0f0a6000b..178325cfe 100644
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -193,21 +193,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-grizzly2-http</artifactId>
diff --git a/pom.xml b/pom.xml
index abe25ea58..a5ccf1cd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>9.0.15</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/renderer/pom.xml b/renderer/pom.xml
index 96d760687..6070d82aa 100644
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index c60833a74..70ff63919 100644
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/tapi/pom.xml b/tapi/pom.xml
index f0f302fdb..6f40711f3 100644
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>2.0.16</version>
+        <version>3.0.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index d0e04f564..1437b8997 100644
--- a/tapimodels/pom.xml
+++ b/tapimodels/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>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/test-common/pom.xml b/test-common/pom.xml
index 018b726b9..9dbdaf94f 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>8.0.15</version>
+    <version>9.0.4</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>2.0.16</version>
+        <version>3.0.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-- 
2.36.6