From 5330ab63271fcf6bc9117607fc7ad42d799b9e77 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 19 Oct 2019 19:36:26 +0200 Subject: [PATCH] Bump to odlparent-4.0.13/yangtools-2.1.13/mdsal-3.0.7 This picks up latest upgrades and fixes. Change-Id: Ic268f6fa4ccd963af771c39dbcf6a5b455e353b5 Signed-off-by: Robert Varga --- benchmark/api/pom.xml | 2 +- benchmark/artifacts/pom.xml | 2 +- benchmark/dsbenchmark/pom.xml | 2 +- benchmark/ntfbenchmark/pom.xml | 2 +- benchmark/pom.xml | 2 +- benchmark/rpcbenchmark/pom.xml | 2 +- features/benchmark/features-mdsal-benchmark/pom.xml | 2 +- features/benchmark/odl-benchmark-api/pom.xml | 4 ++-- features/benchmark/odl-dsbenchmark/pom.xml | 2 +- features/benchmark/odl-mdsal-benchmark/pom.xml | 2 +- features/benchmark/odl-ntfbenchmark/pom.xml | 2 +- features/benchmark/pom.xml | 2 +- features/config-netty/features-config-netty/pom.xml | 2 +- features/config-netty/odl-config-netty/pom.xml | 2 +- features/config-netty/pom.xml | 2 +- features/extras/features-extras/pom.xml | 2 +- features/extras/odl-extras-all/pom.xml | 2 +- features/extras/odl-jolokia/pom.xml | 2 +- features/extras/pom.xml | 2 +- features/mdsal/features-mdsal/pom.xml | 2 +- features/mdsal/odl-clustering-test-app/pom.xml | 4 ++-- features/mdsal/odl-controller-mdsal-common/pom.xml | 4 ++-- features/mdsal/odl-controller-model-topology/pom.xml | 4 ++-- features/mdsal/odl-mdsal-all/pom.xml | 2 +- features/mdsal/odl-mdsal-broker-local/pom.xml | 6 +++--- features/mdsal/odl-mdsal-broker/pom.xml | 2 +- features/mdsal/odl-mdsal-clustering-commons/pom.xml | 2 +- features/mdsal/odl-mdsal-clustering/pom.xml | 2 +- features/mdsal/odl-mdsal-distributed-datastore/pom.xml | 2 +- features/mdsal/odl-mdsal-model-inventory/pom.xml | 4 ++-- features/mdsal/odl-mdsal-remoterpc-connector/pom.xml | 4 ++-- features/mdsal/odl-message-bus-collector/pom.xml | 4 ++-- features/mdsal/odl-toaster/pom.xml | 4 ++-- features/mdsal/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 2 +- opendaylight/archetypes/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 +++--- opendaylight/commons/jolokia/pom.xml | 2 +- opendaylight/config/config-artifacts/pom.xml | 2 +- opendaylight/config/pom.xml | 2 +- .../cluster/access/client/AbstractClientActor.java | 2 +- opendaylight/md-sal/mdsal-artifacts/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-base/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- .../mdsal-trace/features/features-mdsal-trace/pom.xml | 2 +- .../md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/features/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../cluster/example/ExampleRoleChangeListener.java | 2 ++ .../opendaylight/controller/cluster/raft/RaftActor.java | 2 +- opendaylight/md-sal/sal-binding-dom-it/pom.xml | 6 +++--- opendaylight/md-sal/sal-clustering-config/pom.xml | 2 +- .../opendaylight/controller/cluster/datastore/Shard.java | 2 +- .../controller/remote/rpc/registry/RpcRegistry.java | 9 ++++++--- opendaylight/model/model-inventory/pom.xml | 2 +- opendaylight/model/model-topology/pom.xml | 2 +- opendaylight/model/pom.xml | 2 +- pom.xml | 2 +- 62 files changed, 83 insertions(+), 78 deletions(-) diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml index 34d785991c..c9a3427d3a 100644 --- a/benchmark/api/pom.xml +++ b/benchmark/api/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml index e73359228f..91c439c382 100644 --- a/benchmark/artifacts/pom.xml +++ b/benchmark/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml index e6d5a42c92..b49c1a3114 100644 --- a/benchmark/dsbenchmark/pom.xml +++ b/benchmark/dsbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml index d8822b8196..7d7e0e839e 100644 --- a/benchmark/ntfbenchmark/pom.xml +++ b/benchmark/ntfbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index d21190029e..03c36feef4 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 org.opendaylight.controller diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml index 8e6cdd8fe3..110fdcc326 100644 --- a/benchmark/rpcbenchmark/pom.xml +++ b/benchmark/rpcbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml index f9a716eac1..249ac71ba3 100644 --- a/features/benchmark/features-mdsal-benchmark/pom.xml +++ b/features/benchmark/features-mdsal-benchmark/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.11 + 4.0.13 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index ae66e1bab3..2ea2b1a4c8 100644 --- a/features/benchmark/odl-benchmark-api/pom.xml +++ b/features/benchmark/odl-benchmark-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-base - 3.0.10 + 3.0.12 xml features diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml index 439e577474..dd4b8e6375 100644 --- a/features/benchmark/odl-dsbenchmark/pom.xml +++ b/features/benchmark/odl-dsbenchmark/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml index 2a0cf96843..e97e61f2fb 100644 --- a/features/benchmark/odl-mdsal-benchmark/pom.xml +++ b/features/benchmark/odl-mdsal-benchmark/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml index 0d88e64759..7ec369cc09 100644 --- a/features/benchmark/odl-ntfbenchmark/pom.xml +++ b/features/benchmark/odl-ntfbenchmark/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml index 8f91739bc1..ac9be993a5 100644 --- a/features/benchmark/pom.xml +++ b/features/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 org.opendaylight.controller diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml index aed7bd9762..499a089da8 100644 --- a/features/config-netty/features-config-netty/pom.xml +++ b/features/config-netty/features-config-netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.11 + 4.0.13 diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml index 32d94b1c4a..429092bb83 100644 --- a/features/config-netty/odl-config-netty/pom.xml +++ b/features/config-netty/odl-config-netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index 7d8de80353..b7c0db6544 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml index 247029cf89..02ddf1ed1c 100644 --- a/features/extras/features-extras/pom.xml +++ b/features/extras/features-extras/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.11 + 4.0.13 diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml index 90584666da..2978d905e0 100644 --- a/features/extras/odl-extras-all/pom.xml +++ b/features/extras/odl-extras-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml index 40b52a4a28..adc9c0e0ef 100644 --- a/features/extras/odl-jolokia/pom.xml +++ b/features/extras/odl-jolokia/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 05fa7ef651..f098224b09 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml index 18db1c5a20..68b9ae9daf 100644 --- a/features/mdsal/features-mdsal/pom.xml +++ b/features/mdsal/features-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index c831a61e8c..0aa0717d42 100644 --- a/features/mdsal/odl-clustering-test-app/pom.xml +++ b/features/mdsal/odl-clustering-test-app/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -26,7 +26,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 import pom diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index 53def2c05e..987dd91675 100644 --- a/features/mdsal/odl-controller-mdsal-common/pom.xml +++ b/features/mdsal/odl-controller-mdsal-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index 01cca974ec..49dc69c454 100644 --- a/features/mdsal/odl-controller-model-topology/pom.xml +++ b/features/mdsal/odl-controller-model-topology/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml index 2dbe4cb3c9..d6cad79e8e 100644 --- a/features/mdsal/odl-mdsal-all/pom.xml +++ b/features/mdsal/odl-mdsal-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index e65d711cae..b52c17e363 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -32,14 +32,14 @@ org.opendaylight.yangtools yangtools-artifacts - 2.1.11 + 2.1.13 pom import org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index ebd37731c5..1193da3a5d 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml index cef4d9a7e7..7f9f961d96 100644 --- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml +++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml index 0cb14a4d9d..0227837bb2 100644 --- a/features/mdsal/odl-mdsal-clustering/pom.xml +++ b/features/mdsal/odl-mdsal-clustering/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index 7ef71b6f2f..ccd12d1661 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index af19d91485..89440d328c 100644 --- a/features/mdsal/odl-mdsal-model-inventory/pom.xml +++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml index 22f3afc924..b569131928 100644 --- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml +++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -39,7 +39,7 @@ org.opendaylight.odlparent odl-akka-leveldb-0.10 - 4.0.11 + 4.0.13 xml features diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index e8e324914a..64b79c15db 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index 12a2f3197f..aa7fb1df6a 100644 --- a/features/mdsal/odl-toaster/pom.xml +++ b/features/mdsal/odl-toaster/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-runtime - 3.0.10 + 3.0.12 xml features diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index fffe35d50a..6f90daee8c 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/features/pom.xml b/features/pom.xml index 5f851f3d28..748714b4a4 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/karaf/pom.xml b/karaf/pom.xml index 94ccc1baed..29f3fd89ee 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 4.0.11 + 4.0.13 @@ -55,7 +55,7 @@ org.opendaylight.mdsal features-mdsal - 3.0.10 + 3.0.12 features xml runtime diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml index 6f5c215988..f666ecdaa3 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index ce3a0b3138..0e779e3db0 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 47e53512f6..f79096db7d 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.11 + 4.0.13 @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.1.11 + 2.1.13 pom import diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index d4a8c6edf4..2f0de6bee6 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 4.0.11 + 4.0.13 diff --git a/opendaylight/config/config-artifacts/pom.xml b/opendaylight/config/config-artifacts/pom.xml index 966bd101d1..5f598efdbd 100644 --- a/opendaylight/config/config-artifacts/pom.xml +++ b/opendaylight/config/config-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 78001dface..fd0750d4d7 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java index 7b592fbdb2..cc94d9728b 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java @@ -36,7 +36,7 @@ public abstract class AbstractClientActor extends UntypedPersistentActor { } @Override - public void postStop() { + public void postStop() throws Exception { if (currentBehavior != null) { currentBehavior.close(); } diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 871f7f6ff9..1cf9d3104f 100644 --- a/opendaylight/md-sal/mdsal-artifacts/pom.xml +++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index fcc87dee07..ef16851b43 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 4.0.11 + 4.0.13 4.0.0 diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index d0fe574362..cf6414fb86 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml index f99e9e5f75..451446a430 100644 --- a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml index ac5c81590f..73c6292ade 100644 --- a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml index e96418827f..687620560a 100644 --- a/opendaylight/md-sal/mdsal-trace/features/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml index 4ab1f39d32..e1a0e15563 100644 --- a/opendaylight/md-sal/mdsal-trace/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 9df64e2bc4..2e06175831 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 8ab45f07ea..90391574f9 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java index d3bf544ef9..5f70a9bf5f 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java +++ b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.example; import akka.actor.ActorRef; import akka.actor.Cancellable; import akka.actor.Props; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -101,6 +102,7 @@ public class ExampleRoleChangeListener extends AbstractUntypedActor implements A } @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings("REC_CATCH_EXCEPTION") private void sendRegistrationRequests() { for (Map.Entry entry : notifierRegistrationStatus.entrySet()) { if (!entry.getValue()) { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index cdffef3a7a..2a4c64709b 100755 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -151,7 +151,7 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { } @Override - public void postStop() { + public void postStop() throws Exception { context.close(); super.postStop(); } diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 15ed4eb44f..5c02bf8583 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 4.0.11 + 4.0.13 @@ -18,14 +18,14 @@ org.opendaylight.yangtools yangtools-artifacts - 2.1.11 + 2.1.13 pom import org.opendaylight.mdsal mdsal-artifacts - 3.0.10 + 3.0.12 pom import diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index a9761bd70d..8634bf98b2 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index a0c3e7f570..e0a5eb1c04 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -275,7 +275,7 @@ public class Shard extends RaftActor { } @Override - public void postStop() { + public void postStop() throws Exception { LOG.info("Stopping Shard {}", persistenceId()); super.postStop(); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java index 5ba97a306f..5e191c4435 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java @@ -64,9 +64,12 @@ public class RpcRegistry extends BucketStoreActor { } @Override - public void postStop() { - super.postStop(); - this.mxBean.unregister(); + public void postStop() throws Exception { + try { + super.postStop(); + } finally { + this.mxBean.unregister(); + } } @Override diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml index eb5d6a6c1c..41ebd33962 100644 --- a/opendaylight/model/model-inventory/pom.xml +++ b/opendaylight/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml index 3353b5ce20..4e441e0dcb 100644 --- a/opendaylight/model/model-topology/pom.xml +++ b/opendaylight/model/model-topology/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 3.0.10 + 3.0.12 diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml index f87421b875..d5b14c8384 100644 --- a/opendaylight/model/pom.xml +++ b/opendaylight/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 diff --git a/pom.xml b/pom.xml index fc369df6de..14c8df1736 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.11 + 4.0.13 org.opendaylight.controller -- 2.36.6