Bump upstream dependencies to latest Ca versions

Adopt:
- odlparent-13.0.11
- yangtools-13.0.2
- mdsal-13.0.1
- netconf-7.0.2

JIRA: TRNSPRTPCE-782
Change-Id: I88b072fa5abb6c020da743429777f1f2c96075f0
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>

diff --git a/api/pom.xml b/api/pom.xml
index 609cebdd57596b176f88df78e512bb4a49525ad7..81740b679f62c880838bc44f640bf88b09f847cc 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8d35188d36a74b068353c1bc958b8192e3961a2f..9c95f6502f884671f0e59a9094544970b7e03c39 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index e29af55f7e750274e3e6eb031433435d8b8a6de5..5e63a4adb0a7e1451e095d0ed67edd1b5912c779 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index 3652f98820cfa2591d22da28998acda2dea2d7c4..7fa93162af69c678f046bbe5fe4383beef414d59 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 56a95028490b23c0fc4c13aba43d95181b21b56d..f60b5717bc4d7867b7c6c4b09bcdc2a8411587b4 100644 (file)
--- a/features/features-transportpce/pom.xml
+++ b/features/features-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>feature-repo-parent</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml
index 0a83b7d7779134979b5303dde0af477f902203d3..30945dac6b5eef1127659792c833171c020ce4f8 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index 3a61e634f93376da120a2b6903b2528e03ac954e..c42b9a131da50fea0352b1dc5e7700f2663d9ae3 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 
@@ -20,8 +20,8 @@
   <name>OpenDaylight :: transportpce :: Inventory</name>
 
   <properties>
-    <mdsal.version>13.0.0</mdsal.version>
-    <netconf.version>7.0.1</netconf.version>
+    <mdsal.version>13.0.1</mdsal.version>
+    <netconf.version>7.0.2</netconf.version>
     <transportpce.models.version>20.0.0-SNAPSHOT</transportpce.models.version>
     <transportpce.db.host>localhost:3306</transportpce.db.host>
     <transportpce.db.database>transportpce</transportpce.db.database>

diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml
index 431a6d82033bae8ae8b9f24d4724be2bc51cf6f3..1e99fe8d611292b98d7163a7c8f3e3a6e7a67c73 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml
index 8eb9034d3596d67ee62335338b012ee5716f1d2c..a63562ea6402622cd0f3b80505791c513ce4d4a8 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 
@@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce :: tapi</name>
 
   <properties>
-    <mdsal.version>13.0.0</mdsal.version>
-    <netconf.version>7.0.1</netconf.version>
+    <mdsal.version>13.0.1</mdsal.version>
+    <netconf.version>7.0.2</netconf.version>
     <transportpce.models.version>20.0.0-SNAPSHOT</transportpce.models.version>
     <skip.karaf.featureTest>false</skip.karaf.featureTest>
   </properties>
@@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>13.0.0</version>
+        <version>13.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 833495b1ea5f67084d658397f907db2bdd712337..9d5c3c903894ae42fd69b57c1b9be35361c9d2b5 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>13.0.10</version>
+    <version>13.0.11</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>7.0.1</netconf.version>
+    <netconf.version>7.0.2</netconf.version>
     <transportpce.models.version>20.0.0-SNAPSHOT</transportpce.models.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <skip.karaf.featureTest>false</skip.karaf.featureTest>

diff --git a/features/pom.xml b/features/pom.xml
index e59a9b5e3b9ec986b9b106c0c715a9745bfee3c8..8a7027599f4d02a6d12eebb09148e1f1e6f7f08b 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 4b5029b1e18cce42067d70cd4af9dac738a6668d..07e1cfeaa53e570a07da65ccc321ba8074d1ecc4 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 234e3fb3e21f7f55c0e10b9e9b1c99ebac7a910b..1cfd1060001925cc8d1a0766d7845e07ae452101 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml
index bb741bd37e92dd3602275dcff20b6e6571dc5fdc..69eed2152117ef754c4e2a738deb709573868a33 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java
index 4bbfb6404f2a526917e84db6e4c05b56f4e20b0f..c5b2237729cd35b3f55856bac2cfd916e4985d5d 100644 (file)
--- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java
+++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ClassToInstanceMap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
@@ -21,6 +22,7 @@ import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.test.AbstractTest;
 
+
 public class NbiNotificationsProviderTest  extends AbstractTest {
     public static NetworkTransactionService networkTransactionService;
 
@@ -40,7 +42,7 @@ public class NbiNotificationsProviderTest  extends AbstractTest {
         new NbiNotificationsProvider("localhost:8080", "localhost:8080",
                 rpcProviderRegistry, notificationService, getDataStoreContextUtil().getBindingDOMCodecServices(),
                 networkTransactionService);
-        verify(rpcProviderRegistry, times(1)).registerRpcImplementations(any());
+        verify(rpcProviderRegistry, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class));
         verify(notificationService, times(1))
                 .registerCompositeListener(any(NotificationService.CompositeListener.class));
     }

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index fa20641541fa77671f6560c92a71fcf461a44b17..55f6c04899540a7888bdc1c0d4fd1183949e0d20 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 
@@ -38,21 +38,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>13.0.1</version>
+        <version>13.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>13.0.0</version>
+        <version>13.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImplTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImplTest.java
index a1fca452fa732ae63fc1426d82fd0aebf31d0ff7..5093ad2379fc78ee6f608bfeab174d1b01e1f543 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImplTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImplTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ClassToInstanceMap;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -18,6 +19,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 
+
 @ExtendWith(MockitoExtension.class)
 class NetworkUtilsImplTest {
     @Mock
@@ -29,6 +31,6 @@ class NetworkUtilsImplTest {
     void networkUtilsInitTest() {
         new NetworkUtilsImpl(dataBroker, rpcProvider);
 
-        verify(rpcProvider, times(1)).registerRpcImplementations(any());
+        verify(rpcProvider, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class));
     }
 }

diff --git a/olm/pom.xml b/olm/pom.xml
index 42d77db53728c7d2f4e37c9018cd8c59d86cd8f0..950d6c59e1989fd86e0635686e0e36efc0f3b38e 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/pce/pom.xml b/pce/pom.xml
index b6c1103fb98ca16ba2dc36e8d1d19a8b6841f388..9488f51f316adcfa4f9a25262dd12decc4601c10 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>13.0.0</version>
+        <version>13.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java
index edf5efa06008b038cb7d56d8119a58b0094088a4..a90beececd7bbed77ca5b2dcb1d1e8fb1640bc6c 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java
@@ -14,6 +14,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ClassToInstanceMap;
 import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +34,7 @@ import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.CancelResourceReserveInputBuilder;
 
+
 @ExtendWith(MockitoExtension.class)
 public class PceServiceRPCImplTest extends AbstractTest {
 
@@ -58,7 +60,7 @@ public class PceServiceRPCImplTest extends AbstractTest {
     @Test
     void testRpcRegistration() {
         new PceServiceRPCImpl(rpcProviderService, pathComputationService);
-        verify(rpcProviderService, times(1)).registerRpcImplementations(any());
+        verify(rpcProviderService, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class));
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
index 80de7ddd11028647c1bc2570b7d83d72f9e021ac..a23d5be48b8db483843ea4aead0e61e628952912 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-lite</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index ab746325855fc5b8ac304ade44f3e87a4cb5f560..da3f044344298dd6355b9327d0b14d56ae894f71 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImplTest.java
index 99a5a81128591e5e11dea819d9df5fba3b4b8647..b5a0682b4bfe69c30961f91f4748cd01b70c5829 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImplTest.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImplTest.java
@@ -16,6 +16,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +70,7 @@ public class DeviceRendererRPCImplTest {
     @Test
     void testRpcRegistration() {
         new DeviceRendererRPCImpl(rpcProviderService, deviceRenderer, otnDeviceRendererService);
-        verify(rpcProviderService, times(1)).registerRpcImplementations(any());
+        verify(rpcProviderService, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class));
     }
 
     @Test

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 10e9a13a3fd72d183d32bb4d3bb0bbcdb197d405..e5a7bee5ae21c90774c9a2bbe749aa3324d3e839 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
index a531983138f1183e4691f2106b29e8418ee7494f..1e5639cc0f4c3c0c516194828c5e522603b20051 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
@@ -15,6 +15,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl.LogMessages;
 
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
@@ -148,7 +149,7 @@ public class ServicehandlerImplTest extends AbstractTest {
         new ServicehandlerImpl(rpcProviderService, serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl,
                 networkModelListenerImpl, catalogDataStoreOperations, pathComputationService, rendererServiceOperations,
                 notificationPublishService);
-        verify(rpcProviderService, times(1)).registerRpcImplementations(any());
+        verify(rpcProviderService, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class));
     }
 
 //    @Test

diff --git a/tapi/pom.xml b/tapi/pom.xml
index b670be4ca82090f87453609df420c0526840ec11..03c51eed35445f3bac99f860bd2b2dbaa55b84e8 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -40,7 +40,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
index 93cb1686b06c3ac3d48bfb4b082b018aba9d8b30..535ba90b393b6e94b892373f176af6115d645d8e 100644 (file)
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
@@ -14,6 +14,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -61,7 +62,7 @@ public class TapiProviderTest {
                 networkTransactionService, serviceDataStoreOperations,
                 tapiNetworkModelNotificationHandler, tapiNetworkModelServiceImpl);
 
-        verify(rpcProviderService, times(2)).registerRpcImplementations(any());
+        verify(rpcProviderService, times(2)).registerRpcImplementations(any(ClassToInstanceMap.class));
         verify(dataBroker, times(4)).registerTreeChangeListener(any(), any());
     }
 }

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 00f505b83ed81a7998dd8a28cc3eda1cc85520ae..36f681932947259a46a449eebe5acf1e67f31d66 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -37,7 +37,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>