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

diff --git a/algo/pom.xml b/algo/pom.xml
index eb11b332ba0a0573ff535b95f8253a32bb25a59a..f886c78dfc57608cf326fbfa769831da39fa89d5 100644 (file)
--- a/algo/pom.xml
+++ b/algo/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 707cefabb434fcd52b70163a078cdc47b1999989..ecc9fc979ef3c92ea174f90bb42dc0d3a51b7c4a 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/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 0f14c74c80a74697789bcc26180e2f8a0b2b4f09..6afb55ff339b311d13e29808d3e44cbc8ee918fb 100644 (file)
--- 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<Ipv4Routes> routesIID = appPeerBenchmark.getIpv4RoutesIID();
 

diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml
index 2b3f9b86992b822e61323a760357bae0732fa33d..0b142d33aa1b20f50dcb913580aabe1eb4799793 100644 (file)
--- a/bgp/config-example/pom.xml
+++ b/bgp/config-example/pom.xml
@@ -15,7 +15,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/bgp/extensions/pom.xml b/bgp/extensions/pom.xml
index 8c4a29fa2476597963d5171918b8a8868c2296f1..60e15924507d7dfe31a647b3be80ebfab581866d 100644 (file)
--- a/bgp/extensions/pom.xml
+++ b/bgp/extensions/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/bgp/pom.xml b/bgp/pom.xml
index bf5f16b61189a8fcbe044a63856e454c7318e26a..d97e2cc8032ec3e054d27ccaa1603e57d9d40016 100644 (file)
--- a/bgp/pom.xml
+++ b/bgp/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/binding-parent/pom.xml b/binding-parent/pom.xml
index 998cd0323497bb8af8528d590692183f8d5b137e..92ba6066d8e8ba20533949222f173016d6a48e7d 100644 (file)
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>13.0.0</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml
index 7622e8b727bd148472efc289c72f6a28fcb5ecdf..a2491f1d5fa00be1967d41eddf9cf154a829a5c1 100644 (file)
--- a/bmp/bmp-config-example/pom.xml
+++ b/bmp/bmp-config-example/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/bmp/pom.xml b/bmp/pom.xml
index fdabd52b66aea23f5fbba22859e198b6f52aa0e3..17673bf794775abdc6967e3463f2f180fbd3c221 100644 (file)
--- a/bmp/pom.xml
+++ b/bmp/pom.xml
@@ -16,7 +16,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/config-loader/pom.xml b/config-loader/pom.xml
index 53944bfda37f905c5316bf5e7b098d7d4d201c53..7f82670174acb7ee093bc9adde6ee2cb53440336 100644 (file)
--- a/config-loader/pom.xml
+++ b/config-loader/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/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 531fe9250717ae0c956d9f88d2dabe605ad4aae9..68850ac9210dee6ba146e26f4fd30e90a6974575 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index e48baa363395d16bcfb7cc8a5be2588e0f91dae7..ff55c0f611cf12ce2f6f89d623e2f11354fa17d5 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -11,7 +11,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/pom.xml b/features/pom.xml
index c9cffa6dcb2fd61292fb9749198f894abc2134e3..9ffb91e7751ec23cfbc5965ca0d2e62e9382d09f 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/graph/pom.xml b/graph/pom.xml
index ebcaddb129d278f6c98a15f5081efc346e01f2ba..165a6ec7314ee66d0f12716cc9d68c860cb9d2ae 100644 (file)
--- a/graph/pom.xml
+++ b/graph/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/parent/pom.xml b/parent/pom.xml
index 7cbe6c19d75811c3e8022d95f1af709418cd393f..666b716eae56be15be73b1f76f42e630c9430d7e 100644 (file)
--- a/parent/pom.xml
+++ b/parent/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>
 
@@ -47,7 +47,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>9.0.0</version>
+                <version>9.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -55,7 +55,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>13.0.1</version>
+                <version>13.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>13.0.0</version>
+                <version>13.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -79,7 +79,7 @@
             <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>

diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml
index 77a6f1fc2572532e50a7fb24851ccb1266c49c31..4b8e394a5539a1599f1250c9c86171912f179772 100644 (file)
--- a/pcep/config-example/pom.xml
+++ b/pcep/config-example/pom.xml
@@ -11,7 +11,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/pcep/pom.xml b/pcep/pom.xml
index bd001b055e5f3b4f4dedf55c87240597619cd034..90b32da6f7e3ccf69283bb074cafb08597b03612 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/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/pcep/server/pom.xml b/pcep/server/pom.xml
index 0bfad650f6c478d22360fe43b043cc505565ad31..86ae0537bfb2eb4ba1d3820a1cddcb3eb7d22b0d 100644 (file)
--- a/pcep/server/pom.xml
+++ b/pcep/server/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/pcep/topology/pom.xml b/pcep/topology/pom.xml
index 97e17f395a7a74a5f607640ab083f0d4f5781a53..2328220d7d3605da799585619203a86936aaf8e9 100644 (file)
--- a/pcep/topology/pom.xml
+++ b/pcep/topology/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/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml
index 992c24722d6d46577205068b7ff24807db556039..12d232ab91e0cdf9c537f94fbd5710c85f2fdf6d 100644 (file)
--- a/pcep/tunnel/pom.xml
+++ b/pcep/tunnel/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/pom.xml b/pom.xml
index d5793b4f4b7772bdfea667b1718591a4fdd6c89d..4918a858188770aa8fccdaca08a8a04f82739c37 100644 (file)
--- a/pom.xml
+++ b/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/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 b82b0e4a003701eb3dc13fc76ec6e23064297c1c..d4f4a475877e54b3541f25b1adb4ade114a7c7bc 100644 (file)
--- 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 4468eb3ec04bcf2bde084c827c5442c3f18ed320..345755b78cf97138ea26250b88a24e59be1f14cd 100644 (file)
--- a/programming/pom.xml
+++ b/programming/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/rsvp/pom.xml b/rsvp/pom.xml
index 9767c7f407605d2a98914e169f04076997ff2441..f4dc8dae64653e2e4e954524181bfee2e6519184 100644 (file)
--- a/rsvp/pom.xml
+++ b/rsvp/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/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index a10e7e5578a9b9d02e0dae40d253e5359679bb0c..01166410c6c8ac9fa2b9b28d8b9267cf93447da6 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -11,7 +11,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/testtool-parent/pom.xml b/testtool-parent/pom.xml
index 9b838b6db0ba20b630586bace2ce71c1b80c4c97..85466f9742898cddf0cc1379326ee68c3ab20822 100644 (file)
--- a/testtool-parent/pom.xml
+++ b/testtool-parent/pom.xml
@@ -11,7 +11,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/topology/pom.xml b/topology/pom.xml
index de6392a1f2a0b1a2b2156e08132e44aedd569bb8..6875d528b9674f5042dcd52a70e91b2e6d5b472f 100644 (file)
--- a/topology/pom.xml
+++ b/topology/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>