From 7bb5a9a41b90dae65ee238c7a58ccfe9eb5d8387 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 21 Apr 2023 11:28:42 +0200 Subject: [PATCH] Bump upstreams Adopt: - odlparent-12.0.5 - infrautils-5.0.4 - yangtools-10.0.6 - mdsal-11.0.9 - controller-7.0.6 - aaa-0.17.8 Change-Id: I04ec184ebcfc1464f335835de528a8724bce1c8a Signed-off-by: Robert Varga --- apps/pom.xml | 2 +- artifacts/pom.xml | 2 +- .../features-netconf-connector/pom.xml | 2 +- features/netconf-connector/pom.xml | 2 +- features/netconf/features-netconf-testing/pom.xml | 2 +- features/netconf/features-netconf/pom.xml | 2 +- features/netconf/pom.xml | 2 +- features/parent/pom.xml | 2 +- features/pom.xml | 2 +- features/restconf/features-restconf/pom.xml | 2 +- features/restconf/pom.xml | 2 +- features/yanglib/features-yanglib/pom.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf-static/pom.xml | 2 +- karaf/pom.xml | 6 +++--- keystore/pom.xml | 2 +- model/pom.xml | 2 +- netconf/pom.xml | 2 +- netconf/tools/pom.xml | 2 +- parent/pom.xml | 8 ++++---- plugins/pom.xml | 2 +- .../listener/NetconfDeviceCommunicatorTest.java | 11 +++++++++-- pom.xml | 2 +- protocol/pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/sal-rest-connector-config/pom.xml | 2 +- third-party/pom.xml | 2 +- third-party/shaded-exificient-jar/pom.xml | 2 +- third-party/shaded-exificient/pom.xml | 2 +- third-party/shaded-sshd-jar/pom.xml | 2 +- third-party/shaded-sshd/pom.xml | 2 +- transport/pom.xml | 2 +- truststore/pom.xml | 2 +- 33 files changed, 46 insertions(+), 39 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index b818add360..c29ee24a50 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index c6abdbf92f..27737be14f 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index f577c81edf..29192ceef6 100644 --- a/features/netconf-connector/features-netconf-connector/pom.xml +++ b/features/netconf-connector/features-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.5 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 1b94836880..8577be2a9d 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml index 4c4cbdebb9..8730e664f7 100644 --- a/features/netconf/features-netconf-testing/pom.xml +++ b/features/netconf/features-netconf-testing/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.5 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 2320c2611e..635221d461 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.5 diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index f057346b5a..9b0bb290ef 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/features/parent/pom.xml b/features/parent/pom.xml index aecd1e223e..af4d014b7b 100644 --- a/features/parent/pom.xml +++ b/features/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 12.0.3 + 12.0.5 diff --git a/features/pom.xml b/features/pom.xml index 33c1bcb63a..9cf50cdabe 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 49c372643e..ac4dc251f7 100644 --- a/features/restconf/features-restconf/pom.xml +++ b/features/restconf/features-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.5 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index 339b0d0a93..9573ae3825 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index dfd1aac6a0..2208daf7db 100644 --- a/features/yanglib/features-yanglib/pom.xml +++ b/features/yanglib/features-yanglib/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.5 diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index 7d7354aa21..ad135a397f 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml index dfc39f59c2..ae057651a7 100644 --- a/karaf-static/pom.xml +++ b/karaf-static/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf-dist-static - 12.0.3 + 12.0.5 diff --git a/karaf/pom.xml b/karaf/pom.xml index b63664f45d..b8c494d438 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 12.0.3 + 12.0.5 org.opendaylight.netconf @@ -24,14 +24,14 @@ org.opendaylight.infrautils infrautils-artifacts - 5.0.3 + 5.0.4 pom import org.opendaylight.controller controller-artifacts - 7.0.4 + 7.0.6 pom import diff --git a/keystore/pom.xml b/keystore/pom.xml index 63c2455309..132307fdf5 100644 --- a/keystore/pom.xml +++ b/keystore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/model/pom.xml b/model/pom.xml index 6a443c4447..0b95afc185 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/netconf/pom.xml b/netconf/pom.xml index 22949e213f..762cb46953 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 4e3ca57cab..bf57669b7b 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/parent/pom.xml b/parent/pom.xml index 20d5b643aa..bb2ca8bb9e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 11.0.7 + 11.0.9 @@ -25,21 +25,21 @@ org.opendaylight.infrautils infrautils-artifacts - 5.0.3 + 5.0.4 pom import org.opendaylight.aaa aaa-artifacts - 0.17.7 + 0.17.8 pom import org.opendaylight.controller bundle-parent - 7.0.4 + 7.0.6 pom import diff --git a/plugins/pom.xml b/plugins/pom.xml index 994438bbc8..8973ec861a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java index d60a188aec..4dac1378c2 100644 --- a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java +++ b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; +import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -22,6 +23,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.withSettings; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0; import com.google.common.base.CharMatcher; @@ -49,6 +51,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.MockMakers; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; @@ -94,8 +97,12 @@ public class NetconfDeviceCommunicatorTest { public void setUp() throws Exception { communicator = new NetconfDeviceCommunicator( new RemoteDeviceId("test", InetSocketAddress.createUnresolved("localhost", 22)), mockDevice, 10); - spySession = spy(new NetconfClientSession(mock(NetconfClientSessionListener.class), mock(Channel.class), - SESSION_ID.toJava(), Set.of())); + // FIXME: spy() except we override the MockMaker in use + spySession = mock(NetconfClientSession.class, withSettings() + .spiedInstance(new NetconfClientSession(mock(NetconfClientSessionListener.class), mock(Channel.class), + SESSION_ID.toJava(), Set.of())) + .defaultAnswer(CALLS_REAL_METHODS) + .mockMaker(MockMakers.SUBCLASS)); } void setupSession() { diff --git a/pom.xml b/pom.xml index e53d999e0d..b8cb1f9295 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/protocol/pom.xml b/protocol/pom.xml index c3147a9c05..22408d49be 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/restconf/pom.xml b/restconf/pom.xml index 072bb4da03..9f8689f434 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index d6c5d1229f..6ce15be552 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/third-party/pom.xml b/third-party/pom.xml index ec1ab25243..16edbae13d 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/third-party/shaded-exificient-jar/pom.xml b/third-party/shaded-exificient-jar/pom.xml index 7f3447033e..7a7ea3e3be 100644 --- a/third-party/shaded-exificient-jar/pom.xml +++ b/third-party/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 12.0.5 diff --git a/third-party/shaded-exificient/pom.xml b/third-party/shaded-exificient/pom.xml index 3454bb4874..2aa88a598b 100644 --- a/third-party/shaded-exificient/pom.xml +++ b/third-party/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.5 diff --git a/third-party/shaded-sshd-jar/pom.xml b/third-party/shaded-sshd-jar/pom.xml index 753e1a2296..4ff65a07f1 100644 --- a/third-party/shaded-sshd-jar/pom.xml +++ b/third-party/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 12.0.5 diff --git a/third-party/shaded-sshd/pom.xml b/third-party/shaded-sshd/pom.xml index e46b210172..e6850951c0 100644 --- a/third-party/shaded-sshd/pom.xml +++ b/third-party/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.5 diff --git a/transport/pom.xml b/transport/pom.xml index 2e123b74fd..2ecb68b314 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 diff --git a/truststore/pom.xml b/truststore/pom.xml index 39e00001ba..60cc112afd 100644 --- a/truststore/pom.xml +++ b/truststore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.5 -- 2.36.6