From 435a1a7a0e44d79c4cb0f4ea2da09215b7c68f4f Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 23 Mar 2018 14:11:09 +0100 Subject: [PATCH] Bump to odlparent 3.1.0 and yangtools 2.0.3 Change-Id: Ic95557eda8dc9657cf8b41ce84b9f5748fc04a09 Signed-off-by: Stephen Kitt --- benchmark/artifacts/pom.xml | 3 +-- benchmark/pom.xml | 2 +- features/benchmark/features-mdsal-benchmark/pom.xml | 6 ++---- features/benchmark/odl-benchmark-api/pom.xml | 8 +++----- features/benchmark/odl-dsbenchmark/pom.xml | 6 ++---- features/benchmark/odl-mdsal-benchmark/pom.xml | 6 ++---- features/benchmark/odl-ntfbenchmark/pom.xml | 6 ++---- features/benchmark/pom.xml | 5 ++--- features/config-netty/features-config-netty/pom.xml | 6 ++---- features/config-netty/odl-config-netty/pom.xml | 8 +++----- features/config-netty/pom.xml | 5 ++--- .../features-config-persister/pom.xml | 6 ++---- .../odl-config-manager-facade-xml/pom.xml | 8 +++----- .../config-persister/odl-config-persister-all/pom.xml | 8 +++----- .../config-persister/odl-config-persister/pom.xml | 6 ++---- features/config-persister/odl-config-startup/pom.xml | 8 +++----- features/config-persister/pom.xml | 5 ++--- features/config/features-config/pom.xml | 6 ++---- features/config/odl-config-all/pom.xml | 8 +++----- features/config/odl-config-api/pom.xml | 8 +++----- features/config/odl-config-core/pom.xml | 6 ++---- features/config/odl-config-manager/pom.xml | 6 ++---- features/config/odl-config-netty-config-api/pom.xml | 8 +++----- .../src/main/feature/feature.xml | 2 +- features/config/odl-config-util/pom.xml | 8 +++----- .../odl-config-util/src/main/feature/feature.xml | 2 +- features/config/pom.xml | 5 ++--- features/extras/features-extras/pom.xml | 6 ++---- features/extras/odl-extras-all/pom.xml | 6 ++---- features/extras/odl-jolokia/pom.xml | 6 ++---- features/extras/pom.xml | 5 ++--- features/mdsal/features-mdsal/pom.xml | 6 ++---- features/mdsal/odl-clustering-test-app/pom.xml | 8 +++----- features/mdsal/odl-controller-mdsal-common/pom.xml | 6 ++---- features/mdsal/odl-controller-model-topology/pom.xml | 6 ++---- features/mdsal/odl-mdsal-all/pom.xml | 6 ++---- features/mdsal/odl-mdsal-broker-local/pom.xml | 10 ++++------ .../src/main/feature/feature.xml | 4 ++-- features/mdsal/odl-mdsal-broker/pom.xml | 8 +++----- features/mdsal/odl-mdsal-clustering-commons/pom.xml | 8 +++----- .../src/main/feature/feature.xml | 6 +++--- features/mdsal/odl-mdsal-clustering/pom.xml | 8 +++----- .../mdsal/odl-mdsal-distributed-datastore/pom.xml | 6 ++---- features/mdsal/odl-mdsal-model-inventory/pom.xml | 6 ++---- features/mdsal/odl-mdsal-remoterpc-connector/pom.xml | 8 +++----- .../src/main/feature/feature.xml | 2 +- features/mdsal/odl-message-bus-collector/pom.xml | 6 ++---- features/mdsal/odl-toaster/pom.xml | 6 ++---- features/mdsal/pom.xml | 5 ++--- features/pom.xml | 2 +- karaf/pom.xml | 2 +- .../resources/archetype-resources/artifacts/pom.xml | 2 +- .../features/features-__artifactId__/pom.xml | 4 ++-- .../features/odl-__artifactId__-api/pom.xml | 6 ++---- .../features/odl-__artifactId__-cli/pom.xml | 6 ++---- .../features/odl-__artifactId__-rest/pom.xml | 6 ++---- .../features/odl-__artifactId__/pom.xml | 6 ++---- .../resources/archetype-resources/features/pom.xml | 2 +- .../main/resources/archetype-resources/karaf/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- opendaylight/archetypes/pom.xml | 4 ++-- opendaylight/blueprint/pom.xml | 4 ++-- .../blueprint/ext/OpendaylightNamespaceHandler.java | 2 ++ opendaylight/commons/jolokia/pom.xml | 2 +- opendaylight/commons/liblldp/pom.xml | 2 +- opendaylight/config/config-it-base/pom.xml | 10 +++++----- opendaylight/config/config-netty-config/pom.xml | 2 +- opendaylight/config/config-parent/pom.xml | 2 +- .../yangjmxgenerator/ServiceInterfaceEntryTest.java | 2 +- opendaylight/md-sal/benchmark-data-store/pom.xml | 11 +++++------ opendaylight/md-sal/cds-access-api/pom.xml | 4 ++-- opendaylight/md-sal/cds-access-client/pom.xml | 4 ++-- opendaylight/md-sal/cds-dom-api/pom.xml | 4 ++-- opendaylight/md-sal/md-sal-config/pom.xml | 2 +- opendaylight/md-sal/mdsal-artifacts/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-base/pom.xml | 5 +++-- opendaylight/md-sal/mdsal-it-parent/pom.xml | 7 ++++--- opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/cli/pom.xml | 7 +++---- .../mdsal-trace/features/features-mdsal-trace/pom.xml | 6 ++---- .../mdsal-trace/features/odl-mdsal-trace/pom.xml | 6 ++---- opendaylight/md-sal/mdsal-trace/features/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/pom.xml | 2 +- opendaylight/md-sal/messagebus-config/pom.xml | 2 +- opendaylight/md-sal/messagebus-util/pom.xml | 6 ++---- opendaylight/md-sal/pom.xml | 2 +- opendaylight/md-sal/sal-akka-raft-example/pom.xml | 2 +- opendaylight/md-sal/sal-akka-raft/pom.xml | 2 +- .../cluster/raft/behaviors/AbstractLeader.java | 3 +++ opendaylight/md-sal/sal-binding-api/pom.xml | 4 ++-- opendaylight/md-sal/sal-binding-broker/pom.xml | 4 ++-- .../controller/md/sal/binding/impl/FutureSchema.java | 2 ++ opendaylight/md-sal/sal-binding-dom-it/pom.xml | 4 ++-- opendaylight/md-sal/sal-binding-util/pom.xml | 2 +- opendaylight/md-sal/sal-clustering-config/pom.xml | 2 +- opendaylight/md-sal/sal-common-impl/pom.xml | 4 ++-- opendaylight/md-sal/sal-common-testutil/pom.xml | 10 +++++----- opendaylight/md-sal/sal-common-util/pom.xml | 4 ++-- opendaylight/md-sal/sal-connector-api/pom.xml | 4 ++-- opendaylight/md-sal/sal-distributed-datastore/pom.xml | 7 +++++++ .../databroker/AbstractDOMBrokerWriteTransaction.java | 2 ++ .../DistributedEntityOwnershipService.java | 2 ++ .../LeastLoadedCandidateSelectionStrategy.java | 6 +++++- .../datastore/exceptions/NoShardLeaderException.java | 6 +++++- opendaylight/md-sal/sal-dom-api/pom.xml | 4 ++-- opendaylight/md-sal/sal-dom-broker/pom.xml | 4 ++-- .../md/sal/dom/broker/impl/DOMNotificationRouter.java | 2 ++ .../dom/broker/impl/DOMNotificationRouterEvent.java | 2 ++ opendaylight/md-sal/sal-dom-spi/pom.xml | 2 +- .../md-sal/sal-dummy-distributed-datastore/pom.xml | 2 +- opendaylight/md-sal/sal-inmemory-datastore/pom.xml | 2 +- .../impl/InMemoryDOMStoreThreePhaseCommitCohort.java | 2 ++ opendaylight/md-sal/sal-remoterpc-connector/pom.xml | 9 ++++----- opendaylight/md-sal/sal-schema-service/pom.xml | 4 ++-- opendaylight/md-sal/samples/toaster-consumer/pom.xml | 2 +- pom.xml | 2 +- 116 files changed, 244 insertions(+), 306 deletions(-) diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml index 65dde60b48..6d15dea87c 100644 --- a/benchmark/artifacts/pom.xml +++ b/benchmark/artifacts/pom.xml @@ -6,7 +6,6 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - 4.0.0 @@ -14,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index ac6422fa01..cf47a83a46 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 org.opendaylight.controller diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml index 5500c49cb1..8e0164f169 100644 --- a/features/benchmark/features-mdsal-benchmark/pom.xml +++ b/features/benchmark/features-mdsal-benchmark/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index dc2aa00728..bdfd7a6e63 100644 --- a/features/benchmark/odl-benchmark-api/pom.xml +++ b/features/benchmark/odl-benchmark-api/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -39,4 +37,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml index dee027b67a..645b175ca5 100644 --- a/features/benchmark/odl-dsbenchmark/pom.xml +++ b/features/benchmark/odl-dsbenchmark/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml index 28d140872d..888aa96028 100644 --- a/features/benchmark/odl-mdsal-benchmark/pom.xml +++ b/features/benchmark/odl-mdsal-benchmark/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml index 6c00a56d4e..593635df73 100644 --- a/features/benchmark/odl-ntfbenchmark/pom.xml +++ b/features/benchmark/odl-ntfbenchmark/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml index 9fd8ef1dcf..7f2dcce623 100644 --- a/features/benchmark/pom.xml +++ b/features/benchmark/pom.xml @@ -5,13 +5,12 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 org.opendaylight.controller diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml index 08da7d1cdd..07a2282d04 100644 --- a/features/config-netty/features-config-netty/pom.xml +++ b/features/config-netty/features-config-netty/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml index f26186d257..81c56e0692 100644 --- a/features/config-netty/odl-config-netty/pom.xml +++ b/features/config-netty/odl-config-netty/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -85,4 +83,4 @@ - \ No newline at end of file + diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index f36a957b46..2a61153f94 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -6,13 +6,12 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/config-persister/features-config-persister/pom.xml b/features/config-persister/features-config-persister/pom.xml index 6dd9afd552..acb747635f 100644 --- a/features/config-persister/features-config-persister/pom.xml +++ b/features/config-persister/features-config-persister/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/config-persister/odl-config-manager-facade-xml/pom.xml b/features/config-persister/odl-config-manager-facade-xml/pom.xml index a20573e5ab..5123d644ff 100644 --- a/features/config-persister/odl-config-manager-facade-xml/pom.xml +++ b/features/config-persister/odl-config-manager-facade-xml/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -40,4 +38,4 @@ - \ No newline at end of file + diff --git a/features/config-persister/odl-config-persister-all/pom.xml b/features/config-persister/odl-config-persister-all/pom.xml index 37a86fd201..fbcf5175b0 100644 --- a/features/config-persister/odl-config-persister-all/pom.xml +++ b/features/config-persister/odl-config-persister-all/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -42,4 +40,4 @@ - \ No newline at end of file + diff --git a/features/config-persister/odl-config-persister/pom.xml b/features/config-persister/odl-config-persister/pom.xml index 54364b289a..6d40d415a4 100644 --- a/features/config-persister/odl-config-persister/pom.xml +++ b/features/config-persister/odl-config-persister/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/config-persister/odl-config-startup/pom.xml b/features/config-persister/odl-config-startup/pom.xml index 4795cb9b4c..3ac848357e 100644 --- a/features/config-persister/odl-config-startup/pom.xml +++ b/features/config-persister/odl-config-startup/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -35,4 +33,4 @@ - \ No newline at end of file + diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml index 2f518c80f5..a8525af2d5 100644 --- a/features/config-persister/pom.xml +++ b/features/config-persister/pom.xml @@ -6,13 +6,12 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/config/features-config/pom.xml b/features/config/features-config/pom.xml index 244fb40947..6545749e41 100644 --- a/features/config/features-config/pom.xml +++ b/features/config/features-config/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/config/odl-config-all/pom.xml b/features/config/odl-config-all/pom.xml index 57df7c9c4d..ea8a26e570 100644 --- a/features/config/odl-config-all/pom.xml +++ b/features/config/odl-config-all/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -54,4 +52,4 @@ - \ No newline at end of file + diff --git a/features/config/odl-config-api/pom.xml b/features/config/odl-config-api/pom.xml index 140436e932..b54d6f01b1 100644 --- a/features/config/odl-config-api/pom.xml +++ b/features/config/odl-config-api/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -38,4 +36,4 @@ - \ No newline at end of file + diff --git a/features/config/odl-config-core/pom.xml b/features/config/odl-config-core/pom.xml index 00e9854ac3..b98608946c 100644 --- a/features/config/odl-config-core/pom.xml +++ b/features/config/odl-config-core/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/config/odl-config-manager/pom.xml b/features/config/odl-config-manager/pom.xml index af8054c2ad..f5e59b6eb3 100644 --- a/features/config/odl-config-manager/pom.xml +++ b/features/config/odl-config-manager/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/config/odl-config-netty-config-api/pom.xml b/features/config/odl-config-netty-config-api/pom.xml index e0dbbc7ab0..31b7d4aa86 100644 --- a/features/config/odl-config-netty-config-api/pom.xml +++ b/features/config/odl-config-netty-config-api/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -34,7 +32,7 @@ org.opendaylight.odlparent odl-netty-4 - 3.0.2 + 3.1.0 xml features diff --git a/features/config/odl-config-netty-config-api/src/main/feature/feature.xml b/features/config/odl-config-netty-config-api/src/main/feature/feature.xml index 63903bf3e3..f0137072a4 100644 --- a/features/config/odl-config-netty-config-api/src/main/feature/feature.xml +++ b/features/config/odl-config-netty-config-api/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-netty-4 + odl-netty-4 diff --git a/features/config/odl-config-util/pom.xml b/features/config/odl-config-util/pom.xml index 36fa3c4d2c..7778c4fa22 100644 --- a/features/config/odl-config-util/pom.xml +++ b/features/config/odl-config-util/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -28,7 +26,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/features/config/odl-config-util/src/main/feature/feature.xml b/features/config/odl-config-util/src/main/feature/feature.xml index ec7ad36266..fc23670b67 100644 --- a/features/config/odl-config-util/src/main/feature/feature.xml +++ b/features/config/odl-config-util/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/config/pom.xml b/features/config/pom.xml index 67a8443f2c..f99587c675 100644 --- a/features/config/pom.xml +++ b/features/config/pom.xml @@ -6,13 +6,12 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml index 90c78e94aa..10705313f9 100644 --- a/features/extras/features-extras/pom.xml +++ b/features/extras/features-extras/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml index 47b40910b8..87775663af 100644 --- a/features/extras/odl-extras-all/pom.xml +++ b/features/extras/odl-extras-all/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml index 8049121e89..31e920b305 100644 --- a/features/extras/odl-jolokia/pom.xml +++ b/features/extras/odl-jolokia/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/extras/pom.xml b/features/extras/pom.xml index d6892b499a..7c384a7a36 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -6,13 +6,12 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml index 826fdb128e..f4a3ea6e08 100644 --- a/features/mdsal/features-mdsal/pom.xml +++ b/features/mdsal/features-mdsal/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index 1451c79d97..2411fae3cc 100644 --- a/features/mdsal/odl-clustering-test-app/pom.xml +++ b/features/mdsal/odl-clustering-test-app/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -50,4 +48,4 @@ - \ No newline at end of file + diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index f519f19c99..e6cf84376a 100644 --- a/features/mdsal/odl-controller-mdsal-common/pom.xml +++ b/features/mdsal/odl-controller-mdsal-common/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index 5b98f6aa38..673fdfaad0 100644 --- a/features/mdsal/odl-controller-model-topology/pom.xml +++ b/features/mdsal/odl-controller-model-topology/pom.xml @@ -5,15 +5,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml index c9fa05888a..b0bb702c45 100644 --- a/features/mdsal/odl-mdsal-all/pom.xml +++ b/features/mdsal/odl-mdsal-all/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 6ac04456a3..029b2f687e 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -36,14 +34,14 @@ org.opendaylight.odlparent odlparent-artifacts - 3.0.2 + 3.1.0 pom import org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml index cd0bbdf883..9301be6ee2 100644 --- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml @@ -8,8 +8,8 @@ --> - odl-lmax-3 - odl-yangtools-codec + odl-lmax-3 + odl-yangtools-codec mvn:org.opendaylight.controller/sal-schema-service/${project.version} mvn:org.opendaylight.controller/blueprint/${blueprint.version} diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index 536f5c955c..36f66bfdcb 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -101,4 +99,4 @@ datastore - \ No newline at end of file + diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml index 603c8850e4..75b34f6b0a 100644 --- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml +++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -28,7 +26,7 @@ org.opendaylight.odlparent odlparent-artifacts - 3.0.2 + 3.1.0 pom import diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml index 2c9dfd0ac7..f3d473b5af 100644 --- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml @@ -8,8 +8,8 @@ --> - odl-akka-system-2.5 - odl-akka-persistence-2.5 - odl-akka-clustering-2.5 + odl-akka-system-2.5 + odl-akka-persistence-2.5 + odl-akka-clustering-2.5 diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml index 4aa20c38bb..dc9dabd077 100644 --- a/features/mdsal/odl-mdsal-clustering/pom.xml +++ b/features/mdsal/odl-mdsal-clustering/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -33,4 +31,4 @@ - \ No newline at end of file + diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index 5f71a22a95..74383efdeb 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index b2192b2977..98518a5082 100644 --- a/features/mdsal/odl-mdsal-model-inventory/pom.xml +++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml index 0a669bcc2f..182a8768bc 100644 --- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml +++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -41,7 +39,7 @@ org.opendaylight.odlparent odl-akka-leveldb-0.7 - 3.0.2 + 3.1.0 xml features diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml index e64822e9bd..eeb28cc095 100644 --- a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-akka-leveldb-0.7 + odl-akka-leveldb-0.7 diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index ffff495db1..80a761b1ef 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index 3623c4f94b..ec729098c9 100644 --- a/features/mdsal/odl-toaster/pom.xml +++ b/features/mdsal/odl-toaster/pom.xml @@ -6,15 +6,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index a863b050bb..0caa1254df 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -6,13 +6,12 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/pom.xml b/features/pom.xml index 3699ca9a64..ec5bb21b8e 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index 72416d98c2..73d9325efd 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml index 5e3eca72af..4146f73ca8 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml index 992964b5ba..323d5660f0 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 @@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.12.1-SNAPSHOT 1.7.1-SNAPSHOT 1.7.1-SNAPSHOT - 2.0.1 + 2.0.3 etc/opendaylight/karaf diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml index e61a7cc08c..34005a1921 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml index d35aca04da..b504bc1b5c 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml index e69a0637ed..d81e26b813 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml index 8a722409ab..53ee5c5573 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml index 6442af3a50..1670c420e6 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml index 70ce0e6d95..165bebbf63 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml @@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 3.0.2 + 3.1.0 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 3d6ef2fcce..ee7bc0e962 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 INTERNAL org.opendaylight.odlparent odlparent - 3.0.2 + 3.1.0 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 19a052bfe2..131a4d58c4 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 3.0.2 + 3.1.0 @@ -24,7 +24,7 @@ but this is only half of the solution; the other half is setting org.ops4j.pax.url.mvn.localRepository --> org.opendaylight.odlparent opendaylight-karaf-empty - 3.0.2 + 3.1.0 zip diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 2d784799e9..3b762eef7a 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java index 61ff3c2f7d..7ce521e93f 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.blueprint.ext; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.StringReader; import java.net.URL; @@ -157,6 +158,7 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { return component; } + @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl") private static ComponentMetadata decorateServiceReferenceType(final Attr attr, final ComponentMetadata component, final ParserContext context) { if (!(component instanceof MutableServiceReferenceMetadata)) { diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index 20d14bd0b3..42dc5d616b 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 3.0.2 + 3.1.0 diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml index e01a5bb4a6..71f5363d1b 100644 --- a/opendaylight/commons/liblldp/pom.xml +++ b/opendaylight/commons/liblldp/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml index 5fa3dcbf98..2087b6798a 100644 --- a/opendaylight/config/config-it-base/pom.xml +++ b/opendaylight/config/config-it-base/pom.xml @@ -1,13 +1,13 @@ - + - + org.opendaylight.controller @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 3.0.2 + 3.1.0 @@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent opendaylight-karaf-empty - ${opendaylight.karaf.version} + 3.1.0 zip diff --git a/opendaylight/config/config-netty-config/pom.xml b/opendaylight/config/config-netty-config/pom.xml index ba548a0f96..42c0997816 100644 --- a/opendaylight/config/config-netty-config/pom.xml +++ b/opendaylight/config/config-netty-config/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml index cb083e57e7..68d4122e3c 100644 --- a/opendaylight/config/config-parent/pom.xml +++ b/opendaylight/config/config-parent/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.8.1-SNAPSHOT 1.7.1-SNAPSHOT - 2.0.1 + 2.0.3 ${project.build.directory}/generated-sources/config-binding src/main/config/default-config.xml diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java index ae81ce5d3a..04bd7e79c8 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ServiceInterfaceEntryTest.java @@ -114,7 +114,7 @@ public class ServiceInterfaceEntryTest extends AbstractYangTest { is(PackageTranslatorTest.EXPECTED_PACKAGE_PREFIX + ".threadpool.ThreadPool")); - String expectedDescription = "An extension of the simple pool of threads able to schedule " + String expectedDescription = "An extension of the simple pool of threads able to schedule\n" + "work to be executed at some point in time."; assertThat(trimInnerSpacesOrNull(scheduled.getNullableDescription()), is(expectedDescription)); diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml index 641317082c..259fd62c77 100644 --- a/opendaylight/md-sal/benchmark-data-store/pom.xml +++ b/opendaylight/md-sal/benchmark-data-store/pom.xml @@ -6,14 +6,13 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent odlparent - 3.0.2 - + 3.1.0 + @@ -27,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import @@ -88,7 +87,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html java -classpath - + org.openjdk.jmh.Main .* diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml index 5f1593c55e..e2915fb386 100644 --- a/opendaylight/md-sal/cds-access-api/pom.xml +++ b/opendaylight/md-sal/cds-access-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml index 12386e88b0..f58bfa5428 100644 --- a/opendaylight/md-sal/cds-access-client/pom.xml +++ b/opendaylight/md-sal/cds-access-client/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml index c5ec8cc5b1..9306cd6c6c 100644 --- a/opendaylight/md-sal/cds-dom-api/pom.xml +++ b/opendaylight/md-sal/cds-dom-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml index 9edef91ea3..79ad85c83f 100644 --- a/opendaylight/md-sal/md-sal-config/pom.xml +++ b/opendaylight/md-sal/md-sal-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index fca0a2b7cf..17eb33de88 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 - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 206e483db7..050f1e9ef7 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -1,5 +1,6 @@ - + + - + 4.0.0 org.opendaylight.odlparent bundle-parent - 3.0.2 - + 3.1.0 + org.opendaylight.controller 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 e0b4f68038..868e70288d 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 @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent feature-repo-parent - 3.0.2 + 3.1.0 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 d046d431d7..122eec87d0 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 @@ -1,13 +1,11 @@ - + 4.0.0 org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml index 7e7da83540..db38b2743b 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml index c491a89aa0..0f157962d3 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml index 453796d369..1bb0c3d679 100644 --- a/opendaylight/md-sal/messagebus-config/pom.xml +++ b/opendaylight/md-sal/messagebus-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index a37bdc3307..5798ecef9b 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -6,15 +6,13 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 4d80ee12c0..3061b47bd3 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml index 35447ecfe4..f370801775 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml index 44ca785a76..89d2c3e067 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java index ba998d3295..9feea2f0f2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java @@ -15,6 +15,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Collection; @@ -184,6 +185,8 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { } @VisibleForTesting + @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + justification = "Unrecognised NullableDecl") void setSnapshotHolder(@Nullable final SnapshotHolder snapshotHolder) { this.snapshotHolder = Optional.fromNullable(snapshotHolder); } diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index a44c95f5c4..1060c0fead 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 0ddb3efa4d..85f4d5eaa3 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java index 0c316e809d..9d70521603 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/FutureSchema.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.md.sal.binding.impl; import com.google.common.base.Predicate; import com.google.common.base.Throwables; import com.google.common.util.concurrent.SettableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashSet; @@ -145,6 +146,7 @@ class FutureSchema implements AutoCloseable { } } + @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "Void is the only allowed value") final void unlockIfPossible(final BindingRuntimeContext context) { if (!this.schemaPromise.isDone() && apply(context)) { this.schemaPromise.set(null); diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 317d634bf4..8f85f3fad3 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 - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml index 3138455c9a..4720f4294e 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 511830b0c7..dd8f0e79ca 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 - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index 1a7bdd9d21..b781c4820e 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-common-testutil/pom.xml b/opendaylight/md-sal/sal-common-testutil/pom.xml index 0a9dacc68f..f601eaeec1 100644 --- a/opendaylight/md-sal/sal-common-testutil/pom.xml +++ b/opendaylight/md-sal/sal-common-testutil/pom.xml @@ -1,12 +1,12 @@ - + + 4.0.0 org.opendaylight.odlparent odlparent - 3.0.2 - + 3.1.0 + org.opendaylight.controller @@ -27,7 +27,7 @@ org.opendaylight.yangtools testutils - 2.0.1 + 2.0.3 diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index 78fdea1d54..0d53412929 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index bf5ef78099..14d8190f3e 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index cd8940ac16..9f6d24bd3b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -269,6 +269,13 @@ org.codehaus.mojo findbugs-maven-plugin + + + org.opendaylight.odlparent + findbugs + 3.1.1 + + true diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java index 7d519babf5..abc678a195 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java @@ -13,6 +13,7 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -82,6 +83,7 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { Preconditions.checkArgument(data != null, "Attempted to store null data at %s", path); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java index 1cb744670e..b363551b55 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java @@ -19,6 +19,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -179,6 +180,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ } @Override + @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl") public Optional getOwnershipState(final DOMEntity forEntity) { Preconditions.checkNotNull(forEntity, "forEntity cannot be null"); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java index 9db7b0b805..f508ad1589 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java @@ -12,9 +12,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nullable; /** * The LeastLoadedCandidateSelectionStrategy assigns ownership for an entity to the candidate which owns the least @@ -30,7 +32,9 @@ public class LeastLoadedCandidateSelectionStrategy extends AbstractEntityOwnerSe } @Override - public String newOwner(String currentOwner, Collection viableCandidates) { + @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + justification = "Unrecognised NullableDecl") + public String newOwner(@Nullable String currentOwner, Collection viableCandidates) { Preconditions.checkArgument(viableCandidates.size() > 0); String leastLoadedCandidate = null; long leastLoadedCount = Long.MAX_VALUE; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java index 8365177d1b..fed443b5d4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.cluster.datastore.exceptions; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import javax.annotation.Nullable; /** * Exception indicating a shard has no current leader. @@ -21,7 +23,9 @@ public class NoShardLeaderException extends RuntimeException { super(message); } - public NoShardLeaderException(String message, String shardName) { + @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + justification = "Unrecognised NullableDecl") + public NoShardLeaderException(@Nullable String message, String shardName) { super(String.format("%sShard %s currently has no leader. Try again later.", (Strings.isNullOrEmpty(message) ? "" : message + ". "), shardName)); } diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index 80360fab9a..0b84204572 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 4da34cffae..097e4a0a7d 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java index bb2275f1fb..7a4f3e1248 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java @@ -21,6 +21,7 @@ import com.lmax.disruptor.PhasedBackoffWaitStrategy; import com.lmax.disruptor.WaitStrategy; import com.lmax.disruptor.dsl.Disruptor; import com.lmax.disruptor.dsl.ProducerType; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -59,6 +60,7 @@ import org.slf4j.LoggerFactory; * {@link #offerNotification(DOMNotification, long, TimeUnit)} * is realized by arming a background wakeup interrupt. */ +@SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "Void is the only allowed value") public final class DOMNotificationRouter implements AutoCloseable, DOMNotificationPublishService, DOMNotificationService, DOMNotificationSubscriptionListenerRegistry { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java index a1d5faee7c..08725e657e 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java @@ -11,6 +11,7 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.lmax.disruptor.EventFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import org.opendaylight.controller.md.sal.dom.api.DOMNotification; import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListener; @@ -57,6 +58,7 @@ final class DOMNotificationRouterEvent { LOG.trace("Delivery completed"); } + @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "Void is the only allowed value") void setFuture() { future.set(null); notification = null; diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml index 2dafca68ae..cffe43be9e 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml index 18997a903c..d86535519b 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index 1998f40c87..45ddc2d570 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java index a77732a11f..f0e7abfb0a 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java @@ -12,6 +12,7 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.sal.core.spi.data.AbstractDOMStoreTransaction; @@ -24,6 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "Void is the only allowed value") class InMemoryDOMStoreThreePhaseCommitCohort implements DOMStoreThreePhaseCommitCohort { private static final Logger LOG = LoggerFactory.getLogger(InMemoryDOMStoreThreePhaseCommitCohort.class); private static final ListenableFuture SUCCESSFUL_FUTURE = Futures.immediateFuture(null); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index f0b3800876..a5988d85c4 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -26,7 +25,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import @@ -174,7 +173,7 @@ ${project.groupId}.${project.artifactId} - + org.opendaylight.controller.cluster; * diff --git a/opendaylight/md-sal/sal-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml index 0ad0958a73..34595c9608 100644 --- a/opendaylight/md-sal/sal-schema-service/pom.xml +++ b/opendaylight/md-sal/sal-schema-service/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.1 + 2.0.3 pom import diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index db328dd0c6..eb070f1292 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/pom.xml b/pom.xml index dc24bef674..b466d7e6c8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 org.opendaylight.controller -- 2.36.6