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 <robert.varga@pantheon.tech>

diff --git a/apps/pom.xml b/apps/pom.xml
index b818add360e962c1dc7724f54178eff9e6026976..c29ee24a504a1312d141be5ec3fe393885f60b51 100644 (file)
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index c6abdbf92f229c38b5e063f988ce41acf6c52bc3..27737be14fda23128cf9b2b62c4787cf007a3eb0 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>12.0.3</version>
+      <version>12.0.5</version>
       <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index f577c81edf3d1d9253952d6b45e9474f3e21a0f7..29192ceef6132c03c6a22ac1c77b78812b64f7b9 100644 (file)
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 1b94836880a9c937f44b06991c426108c32f69ce..8577be2a9d40fd11a3b11b0dbad2576a5a6ae2d3 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index 4c4cbdebb910098d74a6475590d8b861a57a5e8b..8730e664f732ce19d2b5b3fd9dadf56064a7903a 100644 (file)
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -12,7 +12,7 @@
   <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>feature-repo-parent</artifactId>
-      <version>12.0.3</version>
+      <version>12.0.5</version>
       <relativePath/>
   </parent>
 

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 2320c2611e1a2eda7d3e6c7116c8e3d9dc32739c..635221d4610ba770fe8a8d75f6af83a5d8cebd6f 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index f057346b5ab71fa060e233ffb0f37fec0ff59653..9b0bb290efa7d2b9cadaf7dd546d3c7324e83aa6 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index aecd1e223ebb8a40b3930ad4061e78f96aebf04c..af4d014b7bc3fe778c937a114ed6e395f6012c6a 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 33c1bcb63ad21ecea717d85a6762886f7b1a6528..9cf50cdabe6bda1fc7274c81af8e20b74f26f3a1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 49c372643e4bfa4dd452992eefcc144b42521a31..ac4dc251f7ea93184cd14a9a13eee64d2e15f433 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 339b0d0a933a78c0a8ee3837f4f7f2303ee98651..9573ae38256c3a8df33cd3c3e1361d2eaf912ccd 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index dfd1aac6a04e43ace2400df876806c4e4574b51f..2208daf7db068a03edb881fbe67643ba91e4524b 100644 (file)
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 7d7354aa21d206e72836f803b37f09cef89975e2..ad135a397f616c84ea6c19dfe6f043eebe661675 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index dfc39f59c2312c67a7360dfc2d16b9ff59f8cd71..ae057651a7a68fdf224e9d9e3dbea0ff4e188409 100644 (file)
--- a/karaf-static/pom.xml
+++ b/karaf-static/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-dist-static</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b63664f45d104224b1ad83ff336f2a8fcd22c734..b8c494d4385faa00d2783342e5d38e74ced88fd6 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,14 +24,14 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>7.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/keystore/pom.xml b/keystore/pom.xml
index 63c245530957f95805e9a28e83b3d9d2b43e5d93..132307fdf5897613de43a5b5eaa12745bd16dad1 100644 (file)
--- a/keystore/pom.xml
+++ b/keystore/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 6a443c444782639a746957d5898109a87ca1a6ff..0b95afc185f0a5d64bd80bc8c0b3b4bd6ad9bed5 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 22949e213fb43982a078a0c09f90ae6853229ff4..762cb469532f16c7abbd0c88b3f9ee23b46b4167 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 4e3ca57cab3b294a7fb209b2b6467ed33e863155..bf57669b7b83505faa04fc817153337575867120 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 20d5b643aa68e6373a91cc615dbf7526cf6a0249..bb2ca8bb9e5d7f6b07c8e82e4fa7db96f4ed2a0d 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>11.0.7</version>
+    <version>11.0.9</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.17.7</version>
+        <version>0.17.8</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>7.0.4</version>
+        <version>7.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 994438bbc8c288f6a1ce6fe7c54ee4fb8e2197d7..8973ec861a2582eeb8ff24f675ff4a6db4c91810 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

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 d60a188aeca04b7d31b9ae86ced236c4d1843d3a..4dac1378c2f71fce8b7174e4a84402a96ab885e1 100644 (file)
--- 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 e53d999e0d046f554587fa2244cf78be08a51881..b8cb1f9295e4692c1f846349197847f1141bb1ce 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/protocol/pom.xml b/protocol/pom.xml
index c3147a9c05441e9290d9860ef744b9f75e3faf4e..22408d49be272b6e681bbdecac6be1ad0abe75c3 100644 (file)
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 072bb4da03f763057aa0fc91b31134f37c20b162..9f8689f4348f2e96acd7805889223e3be99e1cad 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index d6c5d1229fe284597e213026cf91a99d8605d99d..6ce15be5524b82cd18d32020e54decdeb3cf9ac1 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/third-party/pom.xml b/third-party/pom.xml
index ec1ab252432216172650ef41e1f687489e10b01b..16edbae13d04b6b04ca0627175ef8f87bd14d3c8 100644 (file)
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-exificient-jar/pom.xml b/third-party/shaded-exificient-jar/pom.xml
index 7f3447033eaecf0078f05f8fea48bede535208f7..7a7ea3e3be25fad1d157bbc5cfdd901ed046bdd2 100644 (file)
--- a/third-party/shaded-exificient-jar/pom.xml
+++ b/third-party/shaded-exificient-jar/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-exificient/pom.xml b/third-party/shaded-exificient/pom.xml
index 3454bb48745b89a769853398b8ff88db362d01b8..2aa88a598bf1d0563b19c1b7572a6ecefd7bcfbd 100644 (file)
--- a/third-party/shaded-exificient/pom.xml
+++ b/third-party/shaded-exificient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-sshd-jar/pom.xml b/third-party/shaded-sshd-jar/pom.xml
index 753e1a2296bb75016a1ec6d7c49897e189536dd8..4ff65a07f1c2828dccc82e8291917b7376687e72 100644 (file)
--- a/third-party/shaded-sshd-jar/pom.xml
+++ b/third-party/shaded-sshd-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-sshd/pom.xml b/third-party/shaded-sshd/pom.xml
index e46b2101722d404cc3ff757c990b7f451e3605b3..e6850951c039350ad6e46845b78c1550c8732d25 100644 (file)
--- a/third-party/shaded-sshd/pom.xml
+++ b/third-party/shaded-sshd/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/transport/pom.xml b/transport/pom.xml
index 2e123b74fdc1b062a59ddce9c69debe58f812280..2ecb68b31414c87db215c16a0dbcb83869fb617e 100644 (file)
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/truststore/pom.xml b/truststore/pom.xml
index 39e00001baa6c04b55255c412804effa8026c4b8..60cc112afd1d0aa23877ef152cc5d5f79037b4ac 100644 (file)
--- a/truststore/pom.xml
+++ b/truststore/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.5</version>
         <relativePath/>
     </parent>