Bump upstreams 77/105477/5
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 17 Apr 2023 12:26:24 +0000 (14:26 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 18 Apr 2023 15:12:39 +0000 (17:12 +0200)
Adopt:
- odlparent-11.0.5
- yangtools-9.0.7
- infrautils-4.0.5
- mdsal-10.0.7
- controller-6.0.8
- aaa-0.16.8
- netconf-4.0.6

Change-Id: Id2a589f303e330c80fe64d3e2371476ed968256c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
46 files changed:
algo/algo-artifacts/pom.xml
algo/pom.xml
artifacts/pom.xml
bgp/bgp-artifacts/pom.xml
bgp/config-example/pom.xml
bgp/extensions/pom.xml
bgp/pom.xml
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java
bgp/topology-provider/pom.xml
binding-parent/pom.xml
bmp/bmp-artifacts/pom.xml
bmp/bmp-config-example/pom.xml
bmp/pom.xml
config-loader/config-loader-artifacts/pom.xml
config-loader/pom.xml
distribution-karaf/pom.xml
feature-repo-parent/pom.xml
features/algo/pom.xml
features/bgp/pom.xml
features/bgpcep-extras/pom.xml
features/bmp/pom.xml
features/concepts/pom.xml
features/config-loader/pom.xml
features/graph/pom.xml
features/pcep/pom.xml
features/pom.xml
features/rsvp/pom.xml
features/topology/pom.xml
graph/graph-artifacts/pom.xml
graph/pom.xml
parent/pom.xml
pcep/config-example/pom.xml
pcep/pcep-artifacts/pom.xml
pcep/pom.xml
pcep/server/pom.xml
pcep/topology/pom.xml
pcep/tunnel/pom.xml
pom.xml
programming/pom.xml
programming/programming-artifacts/pom.xml
rsvp/pom.xml
rsvp/rsvp-artifacts/pom.xml
single-feature-parent/pom.xml
testtool-parent/pom.xml
topology/pom.xml
topology/topology-artifacts/pom.xml

index 9a9ad789cfe6d7d432f8ece3d630003b8fe96176..2cc312fa65617a84a9e41bf3e0a72f79dc90cf4d 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index baff4cdcf85f009f28b0e29560b7a49118f25aee..7156dcdafe64455c1c61ff6f1e07fa7eb9b8f06b 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index fc680320956b695778df93c8ef80b0063055c27d..e5e50c310a84bc3eacff73d2bd73a5e6586486e0 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>11.0.4</version>
+      <version>11.0.5</version>
       <relativePath/>
     </parent>
 
index b91e2b3d05bdd6f8b4f893162080f3424ccf2cf1..31c7159f9f722770eac27664b7dbe449eece9dec 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 062e2007688d0aaa7ffb8af0c0faec27d86e4e1e..38832e4f884de7ca006dd752dd86cf560d62c50f 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index c3204f54487ba774064808022c7d415f6938267a..1525e835ee876a81c8c174618a7637ccc30e06de 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 0445a8dd491b45b0194d20a1d9db5d04e0cf18b3..ecbe1fabb5984851a10de85fd0f7a7815b4df8f1 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 4c29f8d80db7d8da94084452f7650e8a513f355c..e019c4aad51ff3a6f0b8cd8a9a9ab6ae2f68299b 100644 (file)
@@ -149,6 +149,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
         doReturn(domChain).when(dom).createMergingTransactionChain(any(DOMTransactionChainListener.class));
         doReturn(Optional.empty()).when(future).get();
         doReturn(future).when(domTransWrite).commit();
+        doCallRealMethod().when(future).addCallback(any(), any());
         doNothing().when(future).addListener(any(Runnable.class), any(Executor.class));
     }
 
index 50466f4a373d350159f456d43965c40690a9c29a..ab2c0a3f9c6cb2a0dc2e82cbafaf4d989fd8bde7 100644 (file)
             <scope>test</scope>
         </dependency>
 
+        <!-- FIXME: UT fails with mockito-inline -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-subclass</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-impl</artifactId>
index b6c65ab8d3a3c1c0506574162c7a16c532b980de..9b6fadb82615a82259b0e09f21098f096bdd2794 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>10.0.6</version>
+        <version>10.0.7</version>
         <relativePath/>
     </parent>
 
index 38dbb14f32236d5c6b6abc2b122c743e0ac5bd16..1679d694d5ce42424d89c37e0b46dac502f77f82 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 4eebf514a7da3cc49089d073b60532a1960606f6..fa6206be5ed0cca69e420aded7617396f0e99fe2 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 4d96c415929df6af791eb66d22ad5be288c71f5e..eb7b8bf0c582518ed8229d88afb5a6433fd9f727 100644 (file)
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index a19fed4d6538f128fdcc3591823e8522b9a418bc..dea5e5501238392fcdb14a145af0a84baa8cf072 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index ee9b708ea242fa8fc238c74ba75f3403f7800150..60663ede5a88aaafbf6cc63f6e613f6f2118a232 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index bde8e7225d41c5dbb9eb5c645ce8c49f4c31769d..67094f802fc8fc648066d293501c856dc80e73cb 100644 (file)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>11.0.4</version>
+    <version>11.0.5</version>
     <relativePath/>
   </parent>
 
index 5892cf103d4a3278eff7268fed948852abf74a05..6cec0577f6c265f68c3c0fd4af7a90b11326c41d 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index cdade253c6750d4d98617354d576af5edfd760ad..0f7d06b53d913347d782649a9cb707ec38aeb828 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 803720e6aac1c869816d13b42a8848e3331f5eee..0d854bcd160720ce0be5cef33348e558a2b3c598 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 66743b91a92f54e7410ae07ceb5833470c00746c..679af8fb2aeb4a7952a76aedab3324e780c3511f 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 9be623aef495883c40a3ac5e4cd3270c0c1074bd..79ab2d644515c14b2082568c480be6cb29f4b187 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index ba0c0f4d739e4af8e2c526c8e1b686e5e1d2f3ce..3e9dbd4ed906d7b8306f67a67c7bc60626455ccf 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 7a7443163aa308b0ed3eb359de1087ba632dc24e..a1491c27d90840b45ce4f0ff635c695b3a5a6467 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 8166f9f5b0d6d104452989a5dc6a67af8a1dca8d..be26511c44547bb26c0ca54ed43fb49a6f60483d 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 49180588e080785435741b822d5fdcd00b78125d..6f8ae901ac1630ba81c780cac2200929500f8a80 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index d38be60106896d6989a4d53792479fc946c1b2a5..1f42be1e9727a6503f069166ee7e76950e0e0bec 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index ecd331098dbbda710d24940ac52533f37705bcbf..814a4a347168d2bae7280ff4cbe59f2a4a264928 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 62a878f8ae0b4582d413169a2cbd874d8e1c1471..1356d9f4c9830474022487e20262048dffbe2003 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 9f8ee5d502c2b1773b2be6d6c00a894ce2149449..ba029caf374023ebead5f0c27d58be72aedb6292 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 77d08ac950f8b450b4d71144e853b5dfb152f83a..94ef627a1ec041c9cf64d4d6521baa86b5974190 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 9da653de578abfa48c486ce4fbc07b911a333811..929a3262a701b908f95c26e5068bd92767189678 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
@@ -47,7 +47,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.7</version>
+                <version>6.0.8</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -55,7 +55,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>9.0.6</version>
+                <version>9.0.7</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>10.0.6</version>
+                <version>10.0.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>4.0.4</version>
+                <version>4.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -79,7 +79,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>4.0.4</version>
+                <version>4.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index c68ba9faa4d080b0424a4188cc4e3c2fa4e270a2..8f4fc1a823e8e047edeaa6a22f82f297585311fc 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index e03096dee29aa9eb4466f507fe7f8a35fd3eb4f9..7f3527e163f8d339e4a269ac6871416aa4c5ebc1 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 5b3e02955ffa3569a456b6b69787a51bd794287d..7cae3a9572599717d978a04f38e3e1c169d44fbb 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 05b51dde370915f381da3e6f5216c2b55c41d24b..42060ac76e0d20fc8cd6fba5a149349c7f9af31f 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 6ae54662be623076e2883ee8a4e1443471aa773b..5e6a6cf534590a5d12a08ea9028f37d6f4b01a40 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 97c1543eed5223049943664605642ba48fd44cb5..8a1fad17dc741fcba7882e6c0bcc3597b3fa03d4 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index cc2ebbfdd98c09baa2ce11d088ad0db6a840a3a1..4b2f024fdbe5a465a0b73dcd9cae304e0b8d339f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 8a49f3ecf53c89fcc77b9b1e1f9e882c32bbc609..086eb08cd69a9a29c9a94dd710b7043ac18d33ae 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index e29a515ed088e1640ed2005deda6d157cf98e81a..06bc8a7a8933e9de09730c8a0c7101816b146124 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 5d6c67eeb536cdb6aaf2f286e2166e1682ded929..8d34e2a4de12dede275cee6612da0ab130ddfebf 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index e75baba995d901418bed3ad7c8ed2c7bbcd7ea60..ae5a4e1c1013b8fbef4f150c58c4cfaaa747d8c0 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 7dff00d00a22255a1bb849e3bd6d0d4f884b9278..a70de19ff172e11d316e4725cab7bdf06e7df9e8 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 27772f77bc21d8fd424d094bfee000ac711f9d96..99b52081bd0143ae4a60ba812737d4b17b6ab53a 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index 189e4b70961f0a28355a452192aab520d297bc21..a319a0e261ad91b6c2d5f3fa1d161d0cbfbd38ae 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>
 
index e0a7e9d7869f3869391909990c9bc58cf62cd359..ba485f808fd6601faf351bf2e537aee11224b9e4 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.4</version>
+        <version>11.0.5</version>
         <relativePath/>
     </parent>