From 02d2891da4b71fe01ea8027a88ac6ddd353c2bcd Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 30 May 2018 15:44:06 +0200 Subject: [PATCH] Bump odlparent to 3.1.2 Change-Id: I6a155f10ba62ccd4aea5309e5106948d34d099f0 Signed-off-by: Stephen Kitt --- benchmark/artifacts/pom.xml | 2 +- benchmark/pom.xml | 2 +- features/benchmark/features-mdsal-benchmark/pom.xml | 2 +- features/benchmark/odl-benchmark-api/pom.xml | 2 +- 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 | 2 +- features/mdsal/odl-controller-mdsal-common/pom.xml | 2 +- features/mdsal/odl-controller-model-topology/pom.xml | 2 +- features/mdsal/odl-mdsal-all/pom.xml | 2 +- features/mdsal/odl-mdsal-broker-local/pom.xml | 4 ++-- .../mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml | 2 +- features/mdsal/odl-mdsal-broker/pom.xml | 2 +- features/mdsal/odl-mdsal-clustering-commons/pom.xml | 4 ++-- .../odl-mdsal-clustering-commons/src/main/feature/feature.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 | 2 +- features/mdsal/odl-mdsal-remoterpc-connector/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 2 +- features/mdsal/odl-message-bus-collector/pom.xml | 2 +- features/mdsal/odl-toaster/pom.xml | 2 +- features/mdsal/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- opendaylight/archetypes/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 2 +- .../blueprint/ext/OpendaylightNamespaceHandler.java | 2 -- opendaylight/commons/jolokia/pom.xml | 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 +- .../md-sal/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 +- .../controller/cluster/raft/behaviors/AbstractLeader.java | 3 --- opendaylight/md-sal/sal-binding-dom-it/pom.xml | 2 +- opendaylight/md-sal/sal-clustering-config/pom.xml | 2 +- .../cluster/databroker/AbstractDOMBrokerWriteTransaction.java | 2 -- .../entityownership/DistributedEntityOwnershipService.java | 2 -- .../LeastLoadedCandidateSelectionStrategy.java | 3 --- .../cluster/datastore/exceptions/NoShardLeaderException.java | 3 --- pom.xml | 2 +- 57 files changed, 54 insertions(+), 69 deletions(-) diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml index d2b7401727..7f1f206754 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 - 3.1.0 + 3.1.2 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 4b5af9f41a..bf0f820f4d 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.1.0 + 3.1.2 org.opendaylight.controller diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml index 339164e8b6..78881647ef 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 - 3.1.0 + 3.1.2 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index ecc028f2c4..f4476a7184 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 - 3.1.0 + 3.1.2 diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml index b368ef3288..4ec327931a 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 - 3.1.0 + 3.1.2 diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml index b9a02142f4..7df1c36b02 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 - 3.1.0 + 3.1.2 diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml index 75ee74cb97..39a335a83d 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 - 3.1.0 + 3.1.2 diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml index 838e1e6db4..22b5ceefa6 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 org.opendaylight.controller diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml index 5213b4665a..9d4b5c0f17 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 - 3.1.0 + 3.1.2 diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml index c0bb29dd75..2a1d289ea3 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 - 3.1.0 + 3.1.2 diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index 100db8f87c..0cc9527dd8 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml index 81e7126cb0..a46dead36e 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 - 3.1.0 + 3.1.2 diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml index 797522713f..fadb4502b7 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 - 3.1.0 + 3.1.2 diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml index 5536108d1d..347767140a 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 - 3.1.0 + 3.1.2 diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 2d0f211324..4d7c6cace5 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml index b3f728f21a..23b257372c 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index f464b20fb7..0d116aa206 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index d75f08b8ab..a9b74841f9 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index 2b8554fdce..2ab2abeea3 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml index 83d5e4fc79..37e5a4cefe 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 515821e997..081c71bdf1 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 - 3.1.0 + 3.1.2 @@ -32,7 +32,7 @@ org.opendaylight.odlparent odlparent-artifacts - 3.1.0 + 3.1.2 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 48dd0e7da5..b62ed47add 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 @@ -6,7 +6,7 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + odl-lmax-3 odl-yangtools-codec diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index feb13a329c..a62ea5191d 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml index 22340f64cc..9a9ea46bbe 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 - 3.1.0 + 3.1.2 @@ -26,7 +26,7 @@ org.opendaylight.odlparent odlparent-artifacts - 3.1.0 + 3.1.2 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 f3d473b5af..1cc1ba7753 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 @@ -6,7 +6,7 @@ ~ terms of the Eclipse Public License v1.0 which accompanies this distribution, ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + odl-akka-system-2.5 odl-akka-persistence-2.5 diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml index fa77b4c2d1..1393376906 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index 51d138a734..46a7adfe4e 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index a8d270f286..9aa6362fcc 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml index 8f0291bea7..ae9247f028 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 - 3.1.0 + 3.1.2 @@ -39,7 +39,7 @@ org.opendaylight.odlparent odl-akka-leveldb-0.7 - 3.1.0 + 3.1.2 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 eeb28cc095..d1990b6976 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 @@ -6,7 +6,7 @@ ~ terms of the Eclipse Public License v1.0 which accompanies this distribution, ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 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 58ceb2a2a9..b6ae09f3af 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index d8dbacc6d0..e06cf8def8 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 - 3.1.0 + 3.1.2 diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 42e7546897..efe21ffe65 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/features/pom.xml b/features/pom.xml index 2971d590db..469a9a006e 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 6da4c1ac7a..24efcec14d 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 3.1.0 + 3.1.2 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 dd577c7a63..c2bcfb57e9 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 @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 951b7fd885..076ebc5ae4 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index b6753ac2a5..21a41afff5 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 3.1.0 + 3.1.2 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 3673b24b8c..01f922cc61 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,7 +8,6 @@ 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; @@ -160,7 +159,6 @@ 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 da3bae46c5..bf7a91245a 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 3.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 4827669e53..3ac86873cb 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.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 043d1d557e..cdb0c5755b 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 - 3.1.0 + 3.1.2 4.0.0 diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 571037ee0a..68160f292d 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 - 3.1.0 + 3.1.2 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 f9e25ffaed..ec58c9a47f 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 - 3.1.0 + 3.1.2 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 06ce0f1263..7f130beeae 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 - 3.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml index e64942f094..f4815fdf8d 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.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml index 9ae2e5e7e9..12b7c65f83 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.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 7860bd2b79..c755ef465a 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -59,7 +59,7 @@ org.opendaylight.odlparent findbugs - 3.1.1 + 3.1.2 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 054ba2cd71..183bc25de2 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 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 9da9ee6a6f..15dbd74d01 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,7 +15,6 @@ 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; @@ -185,8 +184,6 @@ 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-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index c223d22224..ff14b683c0 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.1.0 + 3.1.2 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index ec78665e35..c942bcd1eb 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.1.0 + 3.1.2 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 21d391c9d7..1d661eb32a 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 @@ -12,7 +12,6 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -79,7 +78,6 @@ 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 b363551b55..1cb744670e 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,7 +19,6 @@ 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; @@ -180,7 +179,6 @@ 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 f508ad1589..7102cbbbf0 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,7 +12,6 @@ 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; @@ -32,8 +31,6 @@ public class LeastLoadedCandidateSelectionStrategy extends AbstractEntityOwnerSe } @Override - @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; 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 fed443b5d4..0ea2e3c843 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,7 +8,6 @@ package org.opendaylight.controller.cluster.datastore.exceptions; import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import javax.annotation.Nullable; /** @@ -23,8 +22,6 @@ public class NoShardLeaderException extends RuntimeException { super(message); } - @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/pom.xml b/pom.xml index fdb4414a4f..699a32d2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 org.opendaylight.controller -- 2.36.6