From 7d1b18404bf1ad41685206e17013ca4b2e062f53 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 17 Mar 2024 20:12:08 +0100 Subject: [PATCH] Bump upstreams Adopt: - odlparent-13.0.11 - infrautils-6.0.6 - yangtools-13.0.2 - mdsal-13.0.1 - controller-9.0.1 - aaa-0.19.2 - netconf-7.0.2 Change-Id: Ia74cc942697ec34ec89804fc8918fb17fc2b825b Signed-off-by: Robert Varga --- algo/pom.xml | 2 +- artifacts/pom.xml | 2 +- .../bgp/benchmark/app/AppPeerBenchmarkTest.java | 7 ++++--- bgp/config-example/pom.xml | 2 +- bgp/extensions/pom.xml | 2 +- bgp/pom.xml | 2 +- binding-parent/pom.xml | 2 +- bmp/bmp-config-example/pom.xml | 2 +- bmp/pom.xml | 2 +- config-loader/pom.xml | 2 +- distribution-karaf/pom.xml | 2 +- feature-repo-parent/pom.xml | 2 +- features/pom.xml | 2 +- graph/pom.xml | 2 +- parent/pom.xml | 12 ++++++------ pcep/config-example/pom.xml | 2 +- pcep/pom.xml | 2 +- pcep/server/pom.xml | 2 +- pcep/topology/pom.xml | 2 +- pcep/tunnel/pom.xml | 2 +- pom.xml | 2 +- .../programming/impl/AbstractProgrammingTest.java | 3 ++- programming/pom.xml | 2 +- rsvp/pom.xml | 2 +- single-feature-parent/pom.xml | 2 +- testtool-parent/pom.xml | 2 +- topology/pom.xml | 2 +- 27 files changed, 36 insertions(+), 34 deletions(-) diff --git a/algo/pom.xml b/algo/pom.xml index eb11b332ba..f886c78dfc 100644 --- a/algo/pom.xml +++ b/algo/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 707cefabb4..ecc9fc979e 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java index 0f14c74c80..6afb55ff33 100644 --- a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java +++ b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java @@ -16,6 +16,7 @@ import static org.opendaylight.protocol.util.CheckTestUtil.checkEquals; import static org.opendaylight.protocol.util.CheckTestUtil.checkNotPresentConfiguration; import static org.opendaylight.protocol.util.CheckTestUtil.readDataConfiguration; +import com.google.common.collect.ClassToInstanceMap; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,13 +54,13 @@ public class AppPeerBenchmarkTest extends AbstractConcurrentDataBrokerTest { @Before public void setUp() { - doReturn(this.registration).when(this.rpcRegistry).registerRpcImplementations(any()); - doNothing().when(this.registration).close(); + doReturn(registration).when(rpcRegistry).registerRpcImplementations(any(ClassToInstanceMap.class)); + doNothing().when(registration).close(); } @Test public void testRpcs() throws Exception { - final AppPeerBenchmark appPeerBenchmark = new AppPeerBenchmark(getDataBroker(), this.rpcRegistry, PEER_RIB_ID); + final AppPeerBenchmark appPeerBenchmark = new AppPeerBenchmark(getDataBroker(), rpcRegistry, PEER_RIB_ID); appPeerBenchmark.start(); final InstanceIdentifier routesIID = appPeerBenchmark.getIpv4RoutesIID(); diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml index 2b3f9b8699..0b142d33aa 100644 --- a/bgp/config-example/pom.xml +++ b/bgp/config-example/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent - 13.0.10 + 13.0.11 diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml index 8c4a29fa24..60e1592450 100644 --- a/bgp/extensions/pom.xml +++ b/bgp/extensions/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/bgp/pom.xml b/bgp/pom.xml index bf5f16b611..d97e2cc803 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml index 998cd03234..92ba6066d8 100644 --- a/binding-parent/pom.xml +++ b/binding-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml index 7622e8b727..a2491f1d5f 100644 --- a/bmp/bmp-config-example/pom.xml +++ b/bmp/bmp-config-example/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 13.0.10 + 13.0.11 diff --git a/bmp/pom.xml b/bmp/pom.xml index fdabd52b66..17673bf794 100644 --- a/bmp/pom.xml +++ b/bmp/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/config-loader/pom.xml b/config-loader/pom.xml index 53944bfda3..7f82670174 100644 --- a/config-loader/pom.xml +++ b/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 531fe92507..68850ac921 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.10 + 13.0.11 diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml index e48baa3633..ff55c0f611 100644 --- a/feature-repo-parent/pom.xml +++ b/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.10 + 13.0.11 diff --git a/features/pom.xml b/features/pom.xml index c9cffa6dcb..9ffb91e775 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/graph/pom.xml b/graph/pom.xml index ebcaddb129..165a6ec731 100644 --- a/graph/pom.xml +++ b/graph/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/parent/pom.xml b/parent/pom.xml index 7cbe6c19d7..666b716eae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.10 + 13.0.11 @@ -47,7 +47,7 @@ org.opendaylight.controller controller-artifacts - 9.0.0 + 9.0.1 import pom @@ -55,7 +55,7 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.1 + 13.0.2 import pom @@ -63,7 +63,7 @@ org.opendaylight.mdsal mdsal-artifacts - 13.0.0 + 13.0.1 pom import @@ -71,7 +71,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2 pom import @@ -79,7 +79,7 @@ org.opendaylight.infrautils infrautils-artifacts - 6.0.5 + 6.0.6 pom import diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml index 77a6f1fc25..4b8e394a55 100644 --- a/pcep/config-example/pom.xml +++ b/pcep/config-example/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 13.0.10 + 13.0.11 diff --git a/pcep/pom.xml b/pcep/pom.xml index bd001b055e..90b32da6f7 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/pcep/server/pom.xml b/pcep/server/pom.xml index 0bfad650f6..86ae0537bf 100644 --- a/pcep/server/pom.xml +++ b/pcep/server/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml index 97e17f395a..2328220d7d 100644 --- a/pcep/topology/pom.xml +++ b/pcep/topology/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml index 992c24722d..12d232ab91 100644 --- a/pcep/tunnel/pom.xml +++ b/pcep/tunnel/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/pom.xml b/pom.xml index d5793b4f4b..4918a85818 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java index b82b0e4a00..d4f4a47587 100644 --- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java +++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java @@ -12,6 +12,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import com.google.common.collect.ClassToInstanceMap; import org.junit.Before; import org.mockito.Mock; import org.opendaylight.mdsal.binding.api.RpcProviderService; @@ -46,7 +47,7 @@ abstract class AbstractProgrammingTest extends AbstractConcurrentDataBrokerTest return null; }).when(singletonServiceRegistration).close(); - doReturn(registration).when(rpcRegistry).registerRpcImplementations(any()); + doReturn(registration).when(rpcRegistry).registerRpcImplementations(any(ClassToInstanceMap.class)); doNothing().when(registration).close(); } diff --git a/programming/pom.xml b/programming/pom.xml index 4468eb3ec0..345755b78c 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index 9767c7f407..f4dc8dae64 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml index a10e7e5578..01166410c6 100644 --- a/single-feature-parent/pom.xml +++ b/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.10 + 13.0.11 diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 9b838b6db0..85466f9742 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 13.0.10 + 13.0.11 diff --git a/topology/pom.xml b/topology/pom.xml index de6392a1f2..6875d528b9 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 -- 2.36.6