From 35f130daadfd5e9847fa5cefaf26eb524afb41d1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 31 May 2020 11:20:36 +0200 Subject: [PATCH] Integrate controller-2.0.1 This bumps versions to the following: - odlparent-7.0.2 - yangtools-5.0.2 - mdsal-6.0.1 - controller-2.0.1 Change-Id: Ie8e42688731e038a771a7ae28131d11ba0b1fb86 Signed-off-by: Robert Varga --- applications/arbitratorreconciliation/pom.xml | 2 +- applications/forwardingrules-manager/pom.xml | 23 +++---------------- applications/forwardingrules-sync/pom.xml | 15 +----------- applications/pom.xml | 2 +- applications/reconciliation-framework/pom.xml | 16 ++++--------- applications/southbound-cli/pom.xml | 16 ++++--------- artifacts/pom.xml | 2 +- distribution/karaf/pom.xml | 2 +- .../features-openflowplugin-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-nxm-extensions/pom.xml | 2 +- .../odl-openflowplugin-onf-extensions/pom.xml | 2 +- .../features-extension-aggregator/pom.xml | 2 +- extension/pom.xml | 2 +- .../features-openflowplugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-app-topology/pom.xml | 2 +- .../odl-openflowplugin-drop-test/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-flow-services/pom.xml | 2 +- .../odl-openflowplugin-libraries/pom.xml | 2 +- .../odl-openflowplugin-nsf-model/pom.xml | 6 ++--- .../odl-openflowplugin-southbound/pom.xml | 4 ++-- features-aggregator/pom.xml | 2 +- libraries/pom.xml | 2 +- model/pom.xml | 2 +- .../features-openflowjava/pom.xml | 2 +- .../odl-openflowjava-protocol/pom.xml | 4 ++-- .../features-openflowjava-aggregator/pom.xml | 2 +- parent/pom.xml | 4 ++-- samples/pom.xml | 2 +- 42 files changed, 57 insertions(+), 99 deletions(-) diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml index 58fb10a360..b718a205bc 100644 --- a/applications/arbitratorreconciliation/pom.xml +++ b/applications/arbitratorreconciliation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml index 4f2ea62f24..37cc37b77e 100644 --- a/applications/forwardingrules-manager/pom.xml +++ b/applications/forwardingrules-manager/pom.xml @@ -59,26 +59,10 @@ org.opendaylight.infrautils infrautils-util - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar - org.opendaylight.openflowplugin openflowplugin-extension-api - - org.awaitility - awaitility - test - org.opendaylight.openflowplugin.applications arbitratorreconciliation-api @@ -89,14 +73,13 @@ true - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.awaitility + awaitility test org.opendaylight.mdsal - mdsal-binding-generator-impl - test + mdsal-binding-test-utils diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml index 842d580258..7de7502314 100644 --- a/applications/forwardingrules-sync/pom.xml +++ b/applications/forwardingrules-sync/pom.xml @@ -54,22 +54,9 @@ guava - - org.slf4j - slf4j-api - - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar + mdsal-binding-test-utils diff --git a/applications/pom.xml b/applications/pom.xml index e2f1d4887f..4f44561e50 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml index b13df088f0..3474073dd7 100644 --- a/applications/reconciliation-framework/pom.xml +++ b/applications/reconciliation-framework/pom.xml @@ -41,17 +41,6 @@ org.opendaylight.openflowplugin.model model-flow-service - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar - org.apache.karaf.shell org.apache.karaf.shell.console @@ -72,6 +61,11 @@ blueprint-maven-plugin-annotation true + + + org.opendaylight.mdsal + mdsal-binding-test-utils + diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml index bd8ef89c9c..76efa19f25 100644 --- a/applications/southbound-cli/pom.xml +++ b/applications/southbound-cli/pom.xml @@ -41,17 +41,6 @@ org.opendaylight.openflowplugin.model model-flow-service - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar - org.apache.karaf.shell org.apache.karaf.shell.console @@ -71,6 +60,11 @@ javax.annotation-api true + + + org.opendaylight.mdsal + mdsal-binding-test-utils + diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 9d217c1917..cc4727a08e 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index f649f64f00..e86ac3cbf3 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 7.0.1 + 7.0.2 org.opendaylight.openflowplugin openflowplugin-karaf diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml index c9d1e519e7..1553337b64 100644 --- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml +++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml index f4b211cd7f..4593f10ab2 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml index a210ae9902..b59c46d2e5 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml index 124ed3e6f2..1ba6702f83 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml index be0ab2c7a0..9cb89bf527 100644 --- a/extension/features-extension-aggregator/pom.xml +++ b/extension/features-extension-aggregator/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 4.0.0 diff --git a/extension/pom.xml b/extension/pom.xml index e17e1221b0..dbdaab71bc 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml index fb58022b3e..824e90ed35 100644 --- a/features-aggregator/features-openflowplugin/pom.xml +++ b/features-aggregator/features-openflowplugin/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml index 6e46eaad2b..2304b9c371 100644 --- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml index 73e686b329..2395355a1c 100644 --- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml index b71fb3ebc7..907b042ff1 100644 --- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml index ccdfe259e6..5be762ec36 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml index 57ea296603..da2eebc433 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml index bc1d89d64a..66427aa42b 100644 --- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml index acbddad438..0f15b555e6 100644 --- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml index 0d48560611..f036509ab9 100644 --- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml index 92dac0d1e9..72b1c707f9 100644 --- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml index 49753b47e9..b13244f7f8 100644 --- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml index 3cb4dfcc9a..1ad72aed27 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml index a50badf495..1ab27958ca 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml index 8e597103c6..7057386108 100644 --- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml index 224aeee3d0..110e4544bb 100644 --- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml +++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml index 381645206d..6f036abb26 100644 --- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml index 1c201554f8..a22229e7c9 100644 --- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml index 43f86e33e8..18c81a73eb 100644 --- a/features-aggregator/odl-openflowplugin-libraries/pom.xml +++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml index c005a08294..a01508d5ae 100644 --- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml +++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 @@ -21,7 +21,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 import pom @@ -30,7 +30,7 @@ org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 import pom diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml index 4af51145b4..e78d760f30 100644 --- a/features-aggregator/odl-openflowplugin-southbound/pom.xml +++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 @@ -29,7 +29,7 @@ org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 import pom diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml index 21c9d3d881..304998f2fa 100644 --- a/features-aggregator/pom.xml +++ b/features-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/libraries/pom.xml b/libraries/pom.xml index 4eca7fa923..6a7ea1ce87 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/model/pom.xml b/model/pom.xml index be13979fef..49d366e268 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml index bd2e1c0314..ce1428cb1b 100644 --- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml index e9fd5b6a04..ed2c901b9f 100644 --- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 @@ -33,7 +33,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 import pom diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml index 29d1387864..c12443e05d 100644 --- a/openflowjava/features-openflowjava-aggregator/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/parent/pom.xml b/parent/pom.xml index b36688edd0..f7adc2e0e3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 6.0.0 + 6.0.1 @@ -41,7 +41,7 @@ org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/samples/pom.xml b/samples/pom.xml index 8c7b7dfc62..67fb57b43d 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 -- 2.36.6