From 9f0ffeeca124b39be45686416d90dcd3067732f4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 3 Mar 2023 02:35:53 +0100 Subject: [PATCH] Bump upstreams Adopt: - odlparent-12.0.3 - infrautils-5.0.3 - yangtools-10.0.4 - mdsal-11.0.7 - controller-7.0.4 - aaa-0.17.6 - netconf-5.0.3 Change-Id: Ia2ae6366ccc691bd7d41ac31d138b870b447193a Signed-off-by: Robert Varga --- algo/algo-artifacts/pom.xml | 2 +- algo/pom.xml | 2 +- artifacts/pom.xml | 2 +- bgp/bgp-artifacts/pom.xml | 2 +- bgp/config-example/pom.xml | 2 +- bgp/extensions/pom.xml | 2 +- bgp/pom.xml | 2 +- .../protocol/bgp/rib/impl/AbstractRIBTestSetup.java | 1 + binding-parent/pom.xml | 2 +- bmp/bmp-artifacts/pom.xml | 2 +- bmp/bmp-config-example/pom.xml | 2 +- bmp/pom.xml | 2 +- config-loader/config-loader-artifacts/pom.xml | 2 +- config-loader/pom.xml | 2 +- distribution-karaf/pom.xml | 2 +- feature-repo-parent/pom.xml | 2 +- features/algo/pom.xml | 2 +- features/bgp/pom.xml | 2 +- features/bgpcep-extras/pom.xml | 2 +- features/bmp/pom.xml | 2 +- features/concepts/pom.xml | 2 +- features/config-loader/pom.xml | 2 +- features/graph/pom.xml | 2 +- features/pcep/pom.xml | 2 +- features/pom.xml | 2 +- features/rsvp/pom.xml | 2 +- features/topology/pom.xml | 2 +- graph/graph-artifacts/pom.xml | 2 +- graph/pom.xml | 2 +- parent/pom.xml | 12 ++++++------ pcep/config-example/pom.xml | 2 +- pcep/pcep-artifacts/pom.xml | 2 +- pcep/pom.xml | 2 +- pcep/server/pom.xml | 2 +- pcep/topology/pom.xml | 2 +- pcep/tunnel/pom.xml | 2 +- pom.xml | 2 +- programming/pom.xml | 2 +- programming/programming-artifacts/pom.xml | 2 +- rsvp/pom.xml | 2 +- rsvp/rsvp-artifacts/pom.xml | 2 +- single-feature-parent/pom.xml | 2 +- testtool-parent/pom.xml | 2 +- topology/pom.xml | 2 +- topology/topology-artifacts/pom.xml | 2 +- 45 files changed, 50 insertions(+), 49 deletions(-) diff --git a/algo/algo-artifacts/pom.xml b/algo/algo-artifacts/pom.xml index 5aca5c41e7..5def11f827 100644 --- a/algo/algo-artifacts/pom.xml +++ b/algo/algo-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/algo/pom.xml b/algo/pom.xml index 7c0e5fca32..e068b99e6f 100644 --- a/algo/pom.xml +++ b/algo/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ac47ff2d5e..c314552e89 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/bgp/bgp-artifacts/pom.xml b/bgp/bgp-artifacts/pom.xml index ab6fed4cad..ecdee64390 100644 --- a/bgp/bgp-artifacts/pom.xml +++ b/bgp/bgp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml index 6346d19be5..4552f6f305 100644 --- a/bgp/config-example/pom.xml +++ b/bgp/config-example/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent - 12.0.2 + 12.0.3 diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml index 5398dae301..44013c7988 100644 --- a/bgp/extensions/pom.xml +++ b/bgp/extensions/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/bgp/pom.xml b/bgp/pom.xml index fbe5aba246..9e069b2272 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java index 4c29f8d80d..e019c4aad5 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java @@ -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)); } diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml index 1d6eb252a9..0d00b4ad72 100644 --- a/binding-parent/pom.xml +++ b/binding-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 11.0.6 + 11.0.7 diff --git a/bmp/bmp-artifacts/pom.xml b/bmp/bmp-artifacts/pom.xml index 110107af62..0225dac8d0 100644 --- a/bmp/bmp-artifacts/pom.xml +++ b/bmp/bmp-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml index 6addea770a..55a553bbea 100644 --- a/bmp/bmp-config-example/pom.xml +++ b/bmp/bmp-config-example/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 12.0.2 + 12.0.3 diff --git a/bmp/pom.xml b/bmp/pom.xml index 121459bea4..73192fcde3 100644 --- a/bmp/pom.xml +++ b/bmp/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/config-loader/config-loader-artifacts/pom.xml b/config-loader/config-loader-artifacts/pom.xml index b820e9c425..b107676b8c 100644 --- a/config-loader/config-loader-artifacts/pom.xml +++ b/config-loader/config-loader-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/config-loader/pom.xml b/config-loader/pom.xml index b9926c7bbd..02e9e2d6b1 100644 --- a/config-loader/pom.xml +++ b/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 5f8b696407..a274e3465c 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 12.0.2 + 12.0.3 diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml index d66ace82b1..faad7bec55 100644 --- a/feature-repo-parent/pom.xml +++ b/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.2 + 12.0.3 diff --git a/features/algo/pom.xml b/features/algo/pom.xml index 3564642b83..916682ba79 100644 --- a/features/algo/pom.xml +++ b/features/algo/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index 24ff1f4936..10090495ae 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml index 3b7ce4a770..9c573f428a 100644 --- a/features/bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index 8464c52ff7..7cb22ba025 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/concepts/pom.xml b/features/concepts/pom.xml index 2acc0e0c1e..b11194b71c 100644 --- a/features/concepts/pom.xml +++ b/features/concepts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/config-loader/pom.xml b/features/config-loader/pom.xml index 19c2246fba..d84edf859d 100644 --- a/features/config-loader/pom.xml +++ b/features/config-loader/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/graph/pom.xml b/features/graph/pom.xml index dbd8145e04..ed5c8274de 100644 --- a/features/graph/pom.xml +++ b/features/graph/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index e25bb48d1a..a7941cc55a 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/pom.xml b/features/pom.xml index 2f0acb0695..0922476a4b 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml index ec93dd9a3a..9f5de43b47 100644 --- a/features/rsvp/pom.xml +++ b/features/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/features/topology/pom.xml b/features/topology/pom.xml index d5fdb9b153..5d1aed6295 100644 --- a/features/topology/pom.xml +++ b/features/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/graph/graph-artifacts/pom.xml b/graph/graph-artifacts/pom.xml index f9940c16b2..b25f2e5f5d 100644 --- a/graph/graph-artifacts/pom.xml +++ b/graph/graph-artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/graph/pom.xml b/graph/pom.xml index d0276f7713..53f5ff17c2 100644 --- a/graph/pom.xml +++ b/graph/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/parent/pom.xml b/parent/pom.xml index 222b79b37e..13fee5e7d5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.2 + 12.0.3 @@ -47,7 +47,7 @@ org.opendaylight.controller controller-artifacts - 7.0.3 + 7.0.4 import pom @@ -55,7 +55,7 @@ org.opendaylight.yangtools yangtools-artifacts - 10.0.3 + 10.0.4 import pom @@ -63,7 +63,7 @@ org.opendaylight.mdsal mdsal-artifacts - 11.0.6 + 11.0.7 pom import @@ -71,7 +71,7 @@ org.opendaylight.netconf netconf-artifacts - 5.0.2 + 5.0.3 pom import @@ -79,7 +79,7 @@ org.opendaylight.infrautils infrautils-artifacts - 5.0.2 + 5.0.3 pom import diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml index 004b998303..7c434caff2 100644 --- a/pcep/config-example/pom.xml +++ b/pcep/config-example/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 12.0.2 + 12.0.3 diff --git a/pcep/pcep-artifacts/pom.xml b/pcep/pcep-artifacts/pom.xml index 46621d92f3..f7573b20f4 100644 --- a/pcep/pcep-artifacts/pom.xml +++ b/pcep/pcep-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/pcep/pom.xml b/pcep/pom.xml index fd19319ad5..2da706fd0e 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/pcep/server/pom.xml b/pcep/server/pom.xml index 10221ac9ae..8bcb5eea48 100644 --- a/pcep/server/pom.xml +++ b/pcep/server/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml index 79111ed89a..d1fbe89f06 100644 --- a/pcep/topology/pom.xml +++ b/pcep/topology/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml index 4a2ee0df1f..7e822c7f88 100644 --- a/pcep/tunnel/pom.xml +++ b/pcep/tunnel/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/pom.xml b/pom.xml index dd952c2fd4..228cda4209 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/programming/pom.xml b/programming/pom.xml index 625a1c243b..49bece8c87 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/programming/programming-artifacts/pom.xml b/programming/programming-artifacts/pom.xml index d5c0a715bd..831f137c79 100644 --- a/programming/programming-artifacts/pom.xml +++ b/programming/programming-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index f7e1f91241..8553be4002 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/rsvp/rsvp-artifacts/pom.xml b/rsvp/rsvp-artifacts/pom.xml index 5f5ec8c6ca..e584f904fb 100644 --- a/rsvp/rsvp-artifacts/pom.xml +++ b/rsvp/rsvp-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml index 29deaf7c86..81fb0d2ba7 100644 --- a/single-feature-parent/pom.xml +++ b/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 12.0.2 + 12.0.3 diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 7f4664a875..2c4b234c36 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 12.0.2 + 12.0.3 diff --git a/topology/pom.xml b/topology/pom.xml index 620d5e26d6..8653428f4b 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 diff --git a/topology/topology-artifacts/pom.xml b/topology/topology-artifacts/pom.xml index a819d90a26..87f10bde0d 100644 --- a/topology/topology-artifacts/pom.xml +++ b/topology/topology-artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.2 + 12.0.3 -- 2.36.6