From e1352a34274092cde87343386655fe984e45df0e Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Mar 2018 18:24:26 +0100 Subject: [PATCH] Bump to odlparent 3.1.0 and yangtools 2.0.3 Change-Id: I9a3afa42f9995598686daf3b2d3885e556fff70b Signed-off-by: Stephen Kitt --- .../netconf-connector/features-netconf-connector/pom.xml | 6 ++---- features/netconf-connector/odl-message-bus/pom.xml | 8 +++----- .../netconf-connector/odl-netconf-callhome-ssh/pom.xml | 8 +++----- .../odl-netconf-clustered-topology/pom.xml | 8 +++----- .../netconf-connector/odl-netconf-connector-all/pom.xml | 8 +++----- .../netconf-connector/odl-netconf-connector-ssh/pom.xml | 8 +++----- features/netconf-connector/odl-netconf-connector/pom.xml | 6 ++---- features/netconf-connector/odl-netconf-console/pom.xml | 8 +++----- features/netconf-connector/odl-netconf-topology/pom.xml | 8 +++----- features/netconf-connector/pom.xml | 7 +++---- features/netconf/features-netconf/pom.xml | 6 ++---- .../netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml | 6 ++---- features/netconf/odl-aaa-netconf-plugin/pom.xml | 6 ++---- features/netconf/odl-netconf-all/pom.xml | 6 ++---- features/netconf/odl-netconf-api/pom.xml | 6 ++---- features/netconf/odl-netconf-client/pom.xml | 6 ++---- features/netconf/odl-netconf-impl/pom.xml | 6 ++---- features/netconf/odl-netconf-mapping-api/pom.xml | 8 +++----- features/netconf/odl-netconf-mdsal/pom.xml | 6 ++---- features/netconf/odl-netconf-monitoring/pom.xml | 8 +++----- features/netconf/odl-netconf-netty-util/pom.xml | 6 ++---- .../odl-netconf-netty-util/src/main/feature/feature.xml | 2 +- features/netconf/odl-netconf-notifications-api/pom.xml | 6 ++---- features/netconf/odl-netconf-notifications-impl/pom.xml | 8 +++----- features/netconf/odl-netconf-ssh/pom.xml | 6 ++---- features/netconf/odl-netconf-tcp/pom.xml | 6 ++---- features/netconf/odl-netconf-util/pom.xml | 8 +++----- .../netconf/odl-netconf-util/src/main/feature/feature.xml | 2 +- features/netconf/pom.xml | 2 +- features/pom.xml | 2 +- .../features-protocol-framework/pom.xml | 6 ++---- .../protocol-framework/odl-protocol-framework/pom.xml | 6 ++---- features/protocol-framework/pom.xml | 5 ++--- features/restconf/features-restconf/pom.xml | 6 ++---- features/restconf/odl-mdsal-apidocs/pom.xml | 8 +++----- features/restconf/odl-restconf-all/pom.xml | 8 +++----- features/restconf/odl-restconf-common/pom.xml | 4 ++-- .../odl-restconf-common/src/main/feature/feature.xml | 4 ++-- features/restconf/odl-restconf-nb-rfc8040-all/pom.xml | 6 ++---- features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml | 6 ++---- features/restconf/odl-restconf-nb-rfc8040/pom.xml | 6 ++---- features/restconf/odl-restconf-noauth/pom.xml | 6 ++---- features/restconf/odl-restconf/pom.xml | 8 +++----- features/restconf/pom.xml | 5 ++--- features/yanglib/features-yanglib/pom.xml | 6 ++---- features/yanglib/odl-yanglib/pom.xml | 6 ++---- features/yanglib/odl-yanglib/src/main/feature/feature.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf/pom.xml | 2 +- netconf/models/pom.xml | 2 +- netconf/netconf-artifacts/pom.xml | 3 +-- netconf/netconf-auth/pom.xml | 1 - netconf/netconf-config/pom.xml | 2 +- netconf/netconf-notifications-impl/pom.xml | 5 +---- .../impl/ops/NotificationsTransformUtil.java | 2 ++ netconf/netconf-parent/pom.xml | 8 ++++++++ netconf/netconf-topology-config/pom.xml | 6 ++---- netconf/pom.xml | 2 +- .../sal/connect/netconf/listener/UncancellableFuture.java | 3 +++ .../sal/connect/netconf/sal/KeepaliveSalFacade.java | 3 +++ netconf/tools/pom.xml | 2 +- pom.xml | 5 ++--- protocol-framework/pom.xml | 4 ++-- restconf/pom.xml | 2 +- restconf/restconf-artifacts/pom.xml | 6 ++---- restconf/restconf-models/pom.xml | 4 ++-- .../netconf/sal/restconf/impl/ControllerContext.java | 2 ++ .../sal/restconf/impl/JSONRestconfServiceImpl.java | 2 ++ .../opendaylight/netconf/sal/restconf/impl/RestCodec.java | 3 +++ .../restconf/nb/rfc8040/codecs/RestCodec.java | 3 +++ .../services/impl/JSONRestconfServiceRfc8040Impl.java | 2 ++ restconf/restconf-parent/pom.xml | 8 ++++++++ restconf/sal-rest-connector-config/pom.xml | 2 +- 73 files changed, 160 insertions(+), 211 deletions(-) diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index 80bd359f95..3c3e98c57f 100644 --- a/features/netconf-connector/features-netconf-connector/pom.xml +++ b/features/netconf-connector/features-netconf-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 feature-repo-parent - 3.0.2 + 3.1.0 diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml index 68cab7fc8f..1c29bb1561 100644 --- a/features/netconf-connector/odl-message-bus/pom.xml +++ b/features/netconf-connector/odl-message-bus/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 @@ -46,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml index 9c377b0212..92e2fc8aeb 100644 --- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-callhome-ssh/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 @@ -49,4 +47,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml index 5c0ace7d88..afbee520e0 100644 --- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-clustered-topology/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 @@ -46,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml index fad28d7ff5..c63daab96e 100644 --- a/features/netconf-connector/odl-netconf-connector-all/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-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 @@ -48,4 +46,4 @@ features - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml index ece1cdcd28..6ceceeb5a2 100644 --- a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-ssh/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,4 +32,4 @@ features - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index 01846a6b67..e64fe761f7 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-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 diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml index e6a198fc40..1bc22e56cb 100644 --- a/features/netconf-connector/odl-netconf-console/pom.xml +++ b/features/netconf-connector/odl-netconf-console/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 @@ -53,4 +51,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml index f264b7b32e..513a48d03b 100644 --- a/features/netconf-connector/odl-netconf-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-topology/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 @@ -46,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index a7e00a478d..cc2f14404c 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/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 - 3.0.2 + 3.1.0 org.opendaylight.netconf @@ -54,7 +53,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.2 + 2.0.3 pom import diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index d4ebbc5b9f..158193c409 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/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/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml index ebfaf49b83..c3f72cbaef 100644 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/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/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index aef73969a5..7ed633e6d4 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/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/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index d3af3f15d4..f9d64ed10a 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-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/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 71d8bca083..df97d42061 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-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 diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml index f8a98ae61a..5f6044a7d2 100644 --- a/features/netconf/odl-netconf-client/pom.xml +++ b/features/netconf/odl-netconf-client/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/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index fa77c751e8..7e194e371b 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/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/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml index 8099fc7ce6..609b61cbdc 100644 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ b/features/netconf/odl-netconf-mapping-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 @@ 1.5.0-SNAPSHOT - \ No newline at end of file + diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index 9a861214c8..518e2410dd 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-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 single-feature-parent - 3.0.2 + 3.1.0 diff --git a/features/netconf/odl-netconf-monitoring/pom.xml b/features/netconf/odl-netconf-monitoring/pom.xml index 9ddc877cc2..501631b956 100644 --- a/features/netconf/odl-netconf-monitoring/pom.xml +++ b/features/netconf/odl-netconf-monitoring/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/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index d149855f0d..d74dce623d 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-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 diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml index c89db48614..71300c618e 100644 --- a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml +++ b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml @@ -9,6 +9,6 @@ ssh - odl-netty-4 + odl-netty-4 diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml index 9f919fdaa9..6ba941a319 100644 --- a/features/netconf/odl-netconf-notifications-api/pom.xml +++ b/features/netconf/odl-netconf-notifications-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 diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 13ca1e0801..4ad90e1fd9 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/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 @@ -46,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index 825ee0a7dc..127c09a3a8 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/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/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml index 551b11725e..b7fc229018 100644 --- a/features/netconf/odl-netconf-tcp/pom.xml +++ b/features/netconf/odl-netconf-tcp/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/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index 676622d026..f7dd416636 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-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 @@ -34,7 +32,7 @@ org.opendaylight.yangtools odl-yangtools-codec - 2.0.2 + 2.0.3 xml features diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-util/src/main/feature/feature.xml index 0a3d259eac..a303505d00 100644 --- a/features/netconf/odl-netconf-util/src/main/feature/feature.xml +++ b/features/netconf/odl-netconf-util/src/main/feature/feature.xml @@ -11,6 +11,6 @@ mvn:org.opendaylight.netconf/netconf-util/${project.version}/cfg/config - odl-yangtools-codec + odl-yangtools-codec diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index 6d2872b9d3..827106b74e 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/pom.xml b/features/pom.xml index 9196254d05..9b19b1a992 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/features/protocol-framework/features-protocol-framework/pom.xml b/features/protocol-framework/features-protocol-framework/pom.xml index 03ad60d9cf..55ed435244 100644 --- a/features/protocol-framework/features-protocol-framework/pom.xml +++ b/features/protocol-framework/features-protocol-framework/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/protocol-framework/odl-protocol-framework/pom.xml b/features/protocol-framework/odl-protocol-framework/pom.xml index 90f6895c81..4cb3da3a89 100644 --- a/features/protocol-framework/odl-protocol-framework/pom.xml +++ b/features/protocol-framework/odl-protocol-framework/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/protocol-framework/pom.xml b/features/protocol-framework/pom.xml index 2918e8aab9..88387b71d4 100644 --- a/features/protocol-framework/pom.xml +++ b/features/protocol-framework/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/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 3a0b608fba..65fd339d1b 100644 --- a/features/restconf/features-restconf/pom.xml +++ b/features/restconf/features-restconf/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/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml index d9f6be98af..4d0682e35a 100644 --- a/features/restconf/odl-mdsal-apidocs/pom.xml +++ b/features/restconf/odl-mdsal-apidocs/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 @@ -46,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml index cf1b502b20..cea087c19b 100644 --- a/features/restconf/odl-restconf-all/pom.xml +++ b/features/restconf/odl-restconf-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 @@ -41,4 +39,4 @@ features - \ No newline at end of file + diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index 91cde29b44..a4e4eff985 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 3.0.2 + 3.1.0 @@ -30,7 +30,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.2 + 2.0.3 pom import diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/restconf/odl-restconf-common/src/main/feature/feature.xml index 6b0dce279f..73cab6308a 100644 --- a/features/restconf/odl-restconf-common/src/main/feature/feature.xml +++ b/features/restconf/odl-restconf-common/src/main/feature/feature.xml @@ -8,8 +8,8 @@ --> - odl-karaf-feat-jetty + odl-karaf-feat-jetty odl-jackson-2.8 - odl-yangtools-export + odl-yangtools-export diff --git a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml index d7b82052e0..ee2fffacef 100644 --- a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040-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/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml index ce9d4d08c0..85c16c680b 100644 --- a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/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/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml index 8c17cf9d22..176486bd88 100644 --- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040/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/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml index 3c1fb76b11..f63beb8a64 100644 --- a/features/restconf/odl-restconf-noauth/pom.xml +++ b/features/restconf/odl-restconf-noauth/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/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml index 0ea252b33f..f190f1a54c 100644 --- a/features/restconf/odl-restconf/pom.xml +++ b/features/restconf/odl-restconf/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 @@ features - \ No newline at end of file + diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index eb932f0bec..0f47d805b3 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/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 features-restconf-aggregator diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index aad6977e0e..6f85357748 100644 --- a/features/yanglib/features-yanglib/pom.xml +++ b/features/yanglib/features-yanglib/pom.xml @@ -7,15 +7,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/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 26787d21bf..2a73a76e70 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/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/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/yanglib/odl-yanglib/src/main/feature/feature.xml index 2093186670..f8acb42040 100644 --- a/features/yanglib/odl-yanglib/src/main/feature/feature.xml +++ b/features/yanglib/odl-yanglib/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-karaf-feat-jetty + odl-karaf-feat-jetty diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index f4676246f7..7577a509ad 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index 22cd91f68f..1fecd96e1a 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 3.0.2 + 3.1.0 org.opendaylight.netconf diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index 500e6f65db..50af9b9974 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml index b9e1d8f887..a56e932b5a 100644 --- a/netconf/netconf-artifacts/pom.xml +++ b/netconf/netconf-artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 @@ -475,4 +475,3 @@ - diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml index b2c0ae02c7..415e8fc31f 100644 --- a/netconf/netconf-auth/pom.xml +++ b/netconf/netconf-auth/pom.xml @@ -6,7 +6,6 @@ ~ 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 diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index 1e0c75ba73..66a9ff3adf 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml index 152d234897..3e420b75fa 100644 --- a/netconf/netconf-notifications-impl/pom.xml +++ b/netconf/netconf-notifications-impl/pom.xml @@ -6,10 +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 --> - - + 4.0.0 org.opendaylight.netconf diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java index 4da6e82868..d2fdaaddb7 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.Collections; import java.util.Date; @@ -66,6 +67,7 @@ public final class NotificationsTransformUtil { NOTIFICATIONS_SCHEMA_CTX)); } + @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "Unrecognised NullableDecl") private static RpcDefinition findCreateSubscriptionRpc() { return Iterables.getFirst(Collections2.filter(NOTIFICATIONS_SCHEMA_CTX.getOperations(), input -> input.getQName().getLocalName().equals(CreateSubscription.CREATE_SUBSCRIPTION)), null); diff --git a/netconf/netconf-parent/pom.xml b/netconf/netconf-parent/pom.xml index acb0b824a9..98ee2e7586 100644 --- a/netconf/netconf-parent/pom.xml +++ b/netconf/netconf-parent/pom.xml @@ -58,6 +58,14 @@ org.codehaus.mojo findbugs-maven-plugin + + + + org.opendaylight.odlparent + findbugs + 3.1.1 + + true diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml index 0ae87786fa..1e3353662c 100644 --- a/netconf/netconf-topology-config/pom.xml +++ b/netconf/netconf-topology-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 bundle-parent - 3.0.2 + 3.1.0 diff --git a/netconf/pom.xml b/netconf/pom.xml index 57ac7cbaf4..4ff9aa326f 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java index 77b7d1c142..126ca5680e 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java @@ -9,6 +9,7 @@ package org.opendaylight.netconf.sal.connect.netconf.listener; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import javax.annotation.Nullable; final class UncancellableFuture extends AbstractFuture { @@ -36,6 +37,8 @@ final class UncancellableFuture extends AbstractFuture { return !uncancellable && super.cancel(mayInterruptIfRunning); } + @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + justification = "Unrecognised NullableDecl") @Override public boolean set(@Nullable final V value) { Preconditions.checkState(uncancellable); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java index 590e5e4cda..82cf4b2337 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java @@ -17,6 +17,7 @@ import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -204,6 +205,8 @@ public final class KeepaliveSalFacade implements RemoteDeviceHandler org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/pom.xml b/pom.xml index 50305a5800..5a578f0232 100644 --- a/pom.xml +++ b/pom.xml @@ -6,15 +6,14 @@ 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/protocol-framework/pom.xml b/protocol-framework/pom.xml index 96a37a3566..b20a22a1e6 100644 --- a/protocol-framework/pom.xml +++ b/protocol-framework/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent bundle-parent - 3.0.2 + 3.1.0 @@ -48,7 +48,7 @@ org.opendaylight.yangtools mockito-configuration - 2.0.2 + 2.0.3 test diff --git a/restconf/pom.xml b/restconf/pom.xml index e12e5e2ca2..4d3a097b41 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml index 5a24058359..ed4f1b2ab3 100644 --- a/restconf/restconf-artifacts/pom.xml +++ b/restconf/restconf-artifacts/pom.xml @@ -6,16 +6,14 @@ 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/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml index bf8279f2e6..1f164c01d1 100644 --- a/restconf/restconf-models/pom.xml +++ b/restconf/restconf-models/pom.xml @@ -1,3 +1,4 @@ + - 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java index d3f669bc7f..988384c24e 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java @@ -13,6 +13,7 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; @@ -528,6 +529,7 @@ public class ControllerContext implements SchemaContextListener { return object == null ? "" : URLEncoder.encode(codec.serialize(object).toString(), URI_ENCODING_CHARSET.name()); } + @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "Unrecognised NullableDecl") private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder, final List strings, final DataNodeContainer parentNode, final DOMMountPoint mountPoint, final boolean returnJustMountPoint) { diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java index 1f5b5744e0..c409e78126 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.netconf.sal.restconf.impl; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -133,6 +134,7 @@ public class JSONRestconfServiceImpl implements JSONRestconfService, AutoCloseab } @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl") @Override public Optional invokeRpc(final String uriPath, final Optional input) throws OperationFailedException { diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java index dbf87cbaf5..4b84cb0dea 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java @@ -7,6 +7,7 @@ */ package org.opendaylight.netconf.sal.restconf.impl; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; @@ -229,6 +230,8 @@ public final class RestCodec { return identityValuesDTO; } + @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", + justification = "Unrecognised NullableDecl") @Override public YangInstanceIdentifier deserialize(final IdentityValuesDTO data) { final List result = new ArrayList<>(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java index 4d9ee346e2..fc55698a99 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java @@ -9,6 +9,7 @@ package org.opendaylight.restconf.nb.rfc8040.codecs; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -247,6 +248,8 @@ public final class RestCodec { return identityValuesDTO; } + @SuppressFBWarnings(value = {"NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"}, justification = "Unrecognised NullableDecl") @Override public YangInstanceIdentifier deserialize(final IdentityValuesDTO data) { final List result = new ArrayList<>(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java index 3fd9e00734..8ec497f31e 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java @@ -9,6 +9,7 @@ package org.opendaylight.restconf.nb.rfc8040.rests.services.impl; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -148,6 +149,7 @@ public class JSONRestconfServiceRfc8040Impl implements JSONRestconfService, Auto } @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl") @Override public Optional invokeRpc(final String uriPath, final Optional input) throws OperationFailedException { diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml index 11febca35e..a67a90c935 100644 --- a/restconf/restconf-parent/pom.xml +++ b/restconf/restconf-parent/pom.xml @@ -73,6 +73,14 @@ org.codehaus.mojo findbugs-maven-plugin + + + + org.opendaylight.odlparent + findbugs + 3.1.1 + + true diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index 241b8a7461..134976edc5 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.0.2 + 3.1.0 -- 2.36.6