From 198afc243c98aedfc5b30b93c1a5e3052d30868c Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 15 Mar 2024 08:34:13 +0100 Subject: [PATCH] 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 --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- common/pom.xml | 4 ++-- dmaap-client/pom.xml | 2 +- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-dmaap-client/pom.xml | 2 +- features/odl-transportpce-inventory/pom.xml | 6 +++--- features/odl-transportpce-nbinotifications/pom.xml | 2 +- features/odl-transportpce-tapi/pom.xml | 8 ++++---- features/odl-transportpce/pom.xml | 4 ++-- features/pom.xml | 2 +- inventory/pom.xml | 4 ++-- karaf/pom.xml | 2 +- nbinotifications/pom.xml | 2 +- .../impl/NbiNotificationsProviderTest.java | 4 +++- networkmodel/pom.xml | 8 ++++---- .../transportpce/networkmodel/NetworkUtilsImplTest.java | 4 +++- olm/pom.xml | 2 +- pce/pom.xml | 4 ++-- .../transportpce/pce/impl/PceServiceRPCImplTest.java | 4 +++- pom.xml | 2 +- renderer/pom.xml | 2 +- .../renderer/rpcs/DeviceRendererRPCImplTest.java | 3 ++- servicehandler/pom.xml | 2 +- .../servicehandler/impl/ServicehandlerImplTest.java | 3 ++- tapi/pom.xml | 4 ++-- .../transportpce/tapi/provider/TapiProviderTest.java | 3 ++- test-common/pom.xml | 4 ++-- 28 files changed, 51 insertions(+), 42 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 609cebdd5..81740b679 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 org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 8d35188d3..9c95f6502 100644 --- 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 org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/common/pom.xml b/common/pom.xml index e29af55f7..5e63a4adb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 import pom diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index 3652f9882..7fa93162a 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 56a950284..f60b5717b 100644 --- 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 org.opendaylight.odlparent feature-repo-parent - 13.0.10 + 13.0.11 diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml index 0a83b7d77..30945dac6 100644 --- a/features/odl-transportpce-dmaap-client/pom.xml +++ b/features/odl-transportpce-dmaap-client/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 3a61e634f..c42b9a131 100644 --- a/features/odl-transportpce-inventory/pom.xml +++ b/features/odl-transportpce-inventory/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 @@ -20,8 +20,8 @@ OpenDaylight :: transportpce :: Inventory - 13.0.0 - 7.0.1 + 13.0.1 + 7.0.2 20.0.0-SNAPSHOT localhost:3306 transportpce diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml index 431a6d820..1e99fe8d6 100644 --- a/features/odl-transportpce-nbinotifications/pom.xml +++ b/features/odl-transportpce-nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index 8eb9034d3..a63562ea6 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 org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce :: tapi - 13.0.0 - 7.0.1 + 13.0.1 + 7.0.2 20.0.0-SNAPSHOT false @@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.mdsal mdsal-artifacts - 13.0.0 + 13.0.1 import pom diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 833495b1e..9d5c3c903 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 org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 7.0.1 + 7.0.2 20.0.0-SNAPSHOT etc/opendaylight/karaf false diff --git a/features/pom.xml b/features/pom.xml index e59a9b5e3..8a7027599 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 org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/inventory/pom.xml b/inventory/pom.xml index 4b5029b1e..07e1cfeaa 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -35,7 +35,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 import pom diff --git a/karaf/pom.xml b/karaf/pom.xml index 234e3fb3e..1cfd10600 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 org.opendaylight.odlparent karaf4-parent - 13.0.10 + 13.0.11 diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index bb741bd37..69eed2152 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 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 4bbfb6404..c5b223772 100644 --- 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 fa2064154..55f6c0489 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 org.opendaylight.odlparent bundle-parent - 13.0.10 + 13.0.11 @@ -38,21 +38,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 13.0.1 + 13.0.2 import pom org.opendaylight.mdsal mdsal-artifacts - 13.0.0 + 13.0.1 import pom org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 import pom 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 a1fca452f..5093ad237 100644 --- 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 42d77db53..950d6c59e 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 org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 diff --git a/pce/pom.xml b/pce/pom.xml index b6c1103fb..9488f51f3 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -39,7 +39,7 @@ org.opendaylight.mdsal mdsal-artifacts - 13.0.0 + 13.0.1 import pom 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 edf5efa06..a90beecec 100644 --- 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 80de7ddd1..a23d5be48 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/renderer/pom.xml b/renderer/pom.xml index ab7463258..da3f04434 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 org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 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 99a5a8112..b5a0682b4 100644 --- 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 10e9a13a3..e5a7bee5a 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 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 a53198313..1e5639cc0 100644 --- 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 b670be4ca..03c51eed3 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -40,7 +40,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 import pom 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 93cb1686b..535ba90b3 100644 --- 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 00f505b83..36f681932 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -37,7 +37,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 import pom -- 2.36.6