From 29e355f4ef9273a35c4d6f83b4dda22634e70402 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 21 Jul 2022 08:21:16 -0400 Subject: [PATCH] Update mockito version Updated mockito version to resolve build errors in ccsdk/sli with Sulfur version of parents Issue-ID: CCSDK-3691 Change-Id: I5e20c70c20e15e62bdf015d69a6e2ef959f4ace2 Signed-off-by: Dan Timoney --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 22 +++++++++++----------- odlparent/bundle-parent/pom.xml | 22 +++++++++++----------- odlparent/feature-repo-parent/pom.xml | 22 +++++++++++----------- odlparent/karaf4-parent/pom.xml | 22 +++++++++++----------- odlparent/mdsal-it-parent/pom.xml | 22 +++++++++++----------- odlparent/odlparent-lite/pom.xml | 22 +++++++++++----------- odlparent/odlparent/pom.xml | 22 +++++++++++----------- .../setup/src/main/resources/pom-template.xml | 2 +- odlparent/single-feature-parent/pom.xml | 22 +++++++++++----------- oparent/pom.xml | 2 +- standalone/pom.xml | 2 +- 13 files changed, 93 insertions(+), 93 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 8c047324..39a9e7bb 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -286,7 +286,7 @@ org.mockito mockito-core - 1.10.19 + 3.12.4 test diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 054f966d..12a6b497 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -183,7 +183,7 @@ org.apache.sshd sshd-core - 2.7.0 + 2.8.0 diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 1b342112..ba194c4c 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.mdsal binding-parent - 9.0.2 + 9.0.4 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 140f9178..4a3b115d 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 0069ada2..8629a837 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent feature-repo-parent - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index be7871d9..e2be76cf 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent karaf4-parent - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index b3c2633d..71e56eeb 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.controller mdsal-it-parent - 5.0.3 + 5.0.5 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 7c12d58c..faacb747 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 30b38bc3..f34eebea 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index beaf7a40..be4fb43c 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -157,7 +157,7 @@ 1.11.7 - 3.3.3 + 3.12.4 4.1.76.Final diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index f70a9784..7038bbab 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent single-feature-parent - 10.0.0 + 10.0.2 @@ -111,13 +111,13 @@ ${ccsdk.sli.version} - 9.0.2 - 10.0.0 - 10.0.0 + 9.0.4 + 10.0.2 + 10.0.2 8.0.5 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.4 + 9.0.4 + 9.0.4 1.15 @@ -137,7 +137,7 @@ 31.1-jre - 2.12.6 + 2.13.2 3.28.0-GA @@ -157,9 +157,9 @@ 1.11.7 - 3.3.3 + 3.12.4 - 4.1.74.Final + 4.1.76.Final 1.7.32 @@ -179,7 +179,7 @@ 1.21.1 2.17.1 2.17.1 - 9.4.43.v20210629 + 9.4.46.v20220331 2.7.5 2.4.0 6.14.3 diff --git a/oparent/pom.xml b/oparent/pom.xml index d3d7fb5e..14b9e872 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -160,7 +160,7 @@ org.mockito mockito-core - 1.10.19 + 3.12.4 test diff --git a/standalone/pom.xml b/standalone/pom.xml index 241ed6f2..5e99bea5 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -145,7 +145,7 @@ org.mockito mockito-core - 1.10.19 + 3.12.4 test -- 2.16.6