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

Change-Id: I8e755e313ab0a69a1c25e776d5daefbd4d0a8320
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
index e49ce7f5a68a7231cd4adec4140c2036f6d6442a..c9bedbef0472e46fca88e911d69dec8445f93cba 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
 import akka.actor.ActorSystem;
 import akka.testkit.javadsl.TestKit;
 import akka.util.Timeout;
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.FluentFuture;
@@ -270,7 +271,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
         builderFactory = new NetconfClientConfigurationBuilderFactoryImpl(mockEncryptionService, credentialProvider,
             sslHandlerFactoryProvider);
 
-        doReturn(mockRpcReg).when(mockRpcProviderService).registerRpcImplementations(any());
+        doReturn(mockRpcReg).when(mockRpcProviderService).registerRpcImplementations(any(ClassToInstanceMap.class));
 
         setupMaster();
 

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
index 9928f1dd8fa1cea28913310e0520c45c83755bee..38e1e32c45270599df86a45b698fb86fe4769ba2 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
@@ -25,6 +25,7 @@ import static org.opendaylight.mdsal.binding.api.DataObjectModification.Modifica
 
 import akka.actor.ActorSystem;
 import akka.util.Timeout;
+import com.google.common.collect.ClassToInstanceMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -133,7 +134,7 @@ public class NetconfTopologyManagerTest extends AbstractBaseSchemasTest {
 
         doNothing().when(mockListenerReg).close();
         doReturn(mockListenerReg).when(dataBroker).registerTreeChangeListener(any(), any());
-        doReturn(mockRpcReg).when(rpcProviderService).registerRpcImplementations(any());
+        doReturn(mockRpcReg).when(rpcProviderService).registerRpcImplementations(any(ClassToInstanceMap.class));
 
         netconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, dataBroker, clusterSingletonServiceProvider,
                 timer, schemaAssembler, actorSystem, clientFactory, mountPointService, encryptionService,

diff --git a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfTopologyRPCProviderTest.java b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfTopologyRPCProviderTest.java
index de7db95e4cfae0c1606f61e38a63f9cd1a839dd7..8bc628a7313436096017843c18e5fbee847e4912 100644 (file)
--- a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfTopologyRPCProviderTest.java
+++ b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfTopologyRPCProviderTest.java
@@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 
+import com.google.common.collect.ClassToInstanceMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,7 +63,7 @@ public class NetconfTopologyRPCProviderTest {
     @Before
     public void setUp() throws Exception {
         doReturn(ENC_PWD.getBytes()).when(encryptionService).encrypt(TEST_PWD.getBytes());
-        doReturn(rpcReg).when(rpcProviderService).registerRpcImplementations(any());
+        doReturn(rpcReg).when(rpcProviderService).registerRpcImplementations(any(ClassToInstanceMap.class));
         rpcProvider = new NetconfTopologyRPCProvider(rpcProviderService, dataBroker, encryptionService, TOPOLOGY_ID);
     }
 

diff --git a/apps/pom.xml b/apps/pom.xml
index 81211d71a80ab3090cb8b946b0b1a331671d3f6d..a76b42622c4dc12289bcf2a7735a67883728afdd 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7faa909c4c443d6bb6fa7538e13c6b011972e4af..b33cd0632014020c03df1d7341793c6852d07e6d 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>13.0.10</version>
+      <version>13.0.11</version>
       <relativePath/>
     </parent>
 

diff --git a/features/features-netconf-experimental/pom.xml b/features/features-netconf-experimental/pom.xml
index e488023205d9a6b229001ef60f4426b48cc7a35e..e04090eb85b145b491f0e17cefb39c10d1d35140 100644 (file)
--- a/features/features-netconf-experimental/pom.xml
+++ b/features/features-netconf-experimental/pom.xml
@@ -14,7 +14,7 @@
     <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/features-netconf-testing/pom.xml b/features/features-netconf-testing/pom.xml
index 946a2696c0032bba1753f8b3281c19c032889c96..a363daa8e30d570bd9e93c86e867f9b30265b44f 100644 (file)
--- a/features/features-netconf-testing/pom.xml
+++ b/features/features-netconf-testing/pom.xml
@@ -12,7 +12,7 @@
   <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/features-netconf/pom.xml b/features/features-netconf/pom.xml
index 7aa4a15fb92707d442200672fd78d9e3948a2db1..837c40ab2a30e186a680f6b241a7dddd2d108226 100644 (file)
--- a/features/features-netconf/pom.xml
+++ b/features/features-netconf/pom.xml
@@ -12,7 +12,7 @@
     <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/parent/pom.xml b/features/parent/pom.xml
index 22938bff19b5eeef4b5ac36c23285209c4d71411..fe6b317d6936396d845e99081f82cf8ac4658556 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

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

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index 7eacbe1ac9787ce3c7f9d7883ee57cebe451120f..d68f3058a743fc5e2ea0d9e2e795972c05b792be 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index ea3d2ff87987e930f9558dd3555b542d57dfcbff..5708065c3773001e60b48adddd028cb767a627f2 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,14 +24,14 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.5</version>
+        <version>6.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>9.0.0</version>
+        <version>9.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/keystore/pom.xml b/keystore/pom.xml
index 25e9eb3ee315e6564d1e164796b634285ade8f5f..304c1accdaf536536b090937018b044a94a2b3d3 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index f0730a352517aee332099fe274a5a7f36b82e7c2..c60ff8376437cf6785090861c8b6355277a09ec3 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 1d27cccda02109c303b90bcb4ad340c36aba3379..b3e5bb16d730f797bcf07ae4fc298ae133db3766 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index c8aa62237ca0734943414a492d444dc8a66fc1a9..234b8cfd10009291ca6818d3bb5c20b0f52dbbc7 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 389ee111efba85af2d686afa9af27bfb7f4a0206..8b1b1e924bfd179e7472a2911affae159c36dd64 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>13.0.0</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.5</version>
+        <version>6.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.0</version>
+        <version>9.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 293b69ccba5f04b5cc17c59447c5829c61508eb3..27b200625a3093b5fcfc36373fc1da4636e05043 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 9ee9a3a4516f9cda9100ba6149dd907143ca88f9..cbc7cb78db1c327b035df6d06abaaeac7a18c116 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <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/protocol/pom.xml b/protocol/pom.xml
index 9fb07a9c30ef61e498dee4f0ccc83821242d2e25..eb25fafc1a27893987e58ec596b13abdb4118cbe 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index fe4642df293c02132412eb396b0093164b4cb090..c7f0f87b80de10a7d6589acd82b50f930d53e20c 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index d393a3b9910901f2cdbfd796c42eeb73d95fb27a..a24921405697e5f8be51a492c489109e0a1e7a24 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>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/third-party/pom.xml b/third-party/pom.xml
index 9a2d98d6ba803636ba59ed2bb7a4f3ad65a35b45..dba76e9e9d90f5b29e4551cd514a5aac5c6f4d44 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-exificient-jar/pom.xml b/third-party/shaded-exificient-jar/pom.xml
index e72088d7e73fb18e1199f7b8d5c18f71a145c275..e60baa61213e1b9f8e57b4d2b53ec69f63e17180 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-exificient/pom.xml b/third-party/shaded-exificient/pom.xml
index 4001047a269cb794df88b7ab2e444bc02c9bcefb..d04da03aad2ebab1540a167151c0939ec7f4c733 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-sshd-jar/pom.xml b/third-party/shaded-sshd-jar/pom.xml
index e19e5cbaf0792230b43b4ca08b2bbbd3037161ba..737358260db9cef54b427791be80e301ea688115 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/third-party/shaded-sshd/pom.xml b/third-party/shaded-sshd/pom.xml
index eeab2ca0e7d491f15e623e2f51c2dfc3b786e976..794def1ea157cee6f9e5ac1fd0cbeb12e4c4e9f5 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/transport/pom.xml b/transport/pom.xml
index 7123c296b4f0c94b9f4f2bc066e085d47e6c7cdf..b69b2821caf2f2ad3933cc6fd634f763ddacd3dd 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/truststore/pom.xml b/truststore/pom.xml
index 9039bc356037a998446a7f93f876f29c3638474c..4ce0cf559055104d7e64e7a335888f5543c8b89d 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>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>