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

diff --git a/api/pom.xml b/api/pom.xml
index 7a8880035880d907a9f158e55010dcaeb5d292a1..6679bdc061632d0704b53a16cafe0397138d1fe8 100644 (file)
--- 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 f2b043613c20aa3840fee37a91b6260aee849eb3..ba2466a13899699c6dbd387418c3f734acd0cb20 100644 (file)
--- 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 e8e5d738ecafa0b68de33075112a737c654edbf0..9ff17cf4a891d0012d5a585683b9cec106051749 100644 (file)
--- 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 564d66090f48a7aad6fb03438c8dfb3d6e5e0c58..785176e8a763950995ec64401b23e8db5afb5996 100644 (file)
--- 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 4e7ae226b985cce681118eee7f7b880ced4028c1..3df9d00b635b344f2c2a981f4f7aeb3e79471ff0 100644 (file)
--- 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 df898c97ceb3eefa9b917f5757b41d9b9166d871..74d8705ba8b122baf33e6b1ff7cfe04421fc25d9 100644 (file)
--- 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 59e119b69a0124f720ae0eb5cea44a022a6f5046..1c8b72b001ec760bea9c4b3feea55e559eb1e37e 100644 (file)
--- 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 49dd0d0bb8c07c3b7e3d1776562bb6f94c404b9d..578fbf86dfd52b0f4c188741580a240ecc29f6ae 100644 (file)
--- 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 229f9d2dca1c656a1fa48b7c75255133f6abfe2f..e895e75031fda6cf4ffacc80d777ed9e873a0e5a 100644 (file)
--- 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 f51e4ad51472f3f379b82c62baa5d7803058dd25..c64df1e3e3a02e78d4521d7270e80074b098a2cf 100644 (file)
--- 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 177b54dbed403b50c974cf28472a3614d5a61cbe..cda5af8b608f8d20aab1e3f01755f38468e168f1 100644 (file)
--- 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 988e34d286f4d06ef38955c1a08378eb437df175..a6fa8f91f27c66c19835356effdb1772c79b3f23 100644 (file)
--- 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 4ddc4af7347fb109d2cf7b6772282785395ffaab..c415d9888f550a08260e9ceb3ccb1385a6401d9e 100644 (file)
--- 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 248a9e69e92c266d2ca8483a22b1a4a153c1cea0..341f49b362b1b78b066b6ef3a2dc13e08d51a681 100644 (file)
--- 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 a1ee52e8a88ed29d68396a28b126b6e462ff32d3..74a5a643773bdfa2fafe2aa2e44282e882564973 100644 (file)
--- 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 c29b7e069d0056e9e93d2e94c724db707450c46f..c72629f450149d637d9407688b2b36e9e23f931e 100644 (file)
--- 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 9c8451c159a041a0ea2bd7d91c7485a8a9f0f2a2..99469b5927e19c96154fee2afccdb7ff9be99296 100644 (file)
--- 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 87a29072379e3884126412b215a39583917a6998..a5c1e05093b5eac4ddbb3dbb260f75bf97aaa515 100644 (file)
--- 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 5f75a01909071295b8b69ada4803ce1c9f164234..cb7a5b21dfb7f8821d598f44867d3a4a94865da6 100644 (file)
--- 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 2f0f8f2a0ea27812b7cd8fd98b958f76436c8b75..ee048bfce27c5d8dcc3beca4911ba98b8805de44 100644 (file)
--- 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 0f0a6000b3b0696bd0830bd3dab417159737d768..178325cfef1d01939222ca48c539e72fdae16b7b 100644 (file)
--- 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 abe25ea58935b02032c2554823fb0eedc01f2f0f..a5ccf1cd58470d1d2ff9e4b7d3d48acd1991df35 100644 (file)
--- 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 96d760687c607a853a00b985df9f6d0688ead41a..6070d82aa2ebc4776190b0cf7e2e5358012f7d65 100644 (file)
--- 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 c60833a746f39c24ed7f43dbda1d40614f04c1ce..70ff6391901623cda178dfac875a2094e7358336 100644 (file)
--- 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 f0f302fdb1fc5a22dd90f8a1fc934a4c592c39a2..6f40711f3027e9cad9defacb68cd349b3e9159d1 100644 (file)
--- 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 d0e04f56436a4c9fee5c17d30b04b83bce3264e8..1437b8997eaf3f4d02d66f16c09cde3e72f10437 100644 (file)
--- 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 018b726b92b6c588b8651b40e2589398a0d56abb..9dbdaf94fce7a25e719b64f2974a0b065ef39f8f 100644 (file)
--- 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>