From 14f35cba90e93b69f038a243a6dd4eadac933a58 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Mar 2018 18:24:27 +0100 Subject: [PATCH] Bump to odlparent 3.1.0 and yangtools 2.0.3 Change-Id: I3b8303b38036318ba9c3bd56d1044873a9b57d78 Signed-off-by: Stephen Kitt Signed-off-by: Ryan Goulding --- 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 ++--- .../config-persister/features-config-persister/pom.xml | 6 ++---- .../odl-config-manager-facade-xml/pom.xml | 8 +++----- .../config-persister/odl-config-persister-all/pom.xml | 8 +++----- features/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 +++----- features/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/config/config-it-base/pom.xml | 10 +++++----- opendaylight/config/config-netty-config/pom.xml | 2 +- opendaylight/config/config-parent/pom.xml | 9 ++++----- 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 ++++--- .../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/parent/pom.xml | 9 ++++++++- opendaylight/md-sal/pom.xml | 2 +- .../cluster/raft/behaviors/AbstractLeader.java | 3 +++ .../controller/md/sal/binding/impl/FutureSchema.java | 2 ++ opendaylight/md-sal/sal-binding-dom-it/pom.xml | 4 ++-- opendaylight/md-sal/sal-clustering-config/pom.xml | 2 +- .../databroker/AbstractDOMBrokerWriteTransaction.java | 2 ++ .../DistributedEntityOwnershipService.java | 2 ++ .../LeastLoadedCandidateSelectionStrategy.java | 6 +++++- .../datastore/exceptions/NoShardLeaderException.java | 6 +++++- .../md/sal/dom/broker/impl/DOMNotificationRouter.java | 2 ++ .../dom/broker/impl/DOMNotificationRouterEvent.java | 2 ++ .../impl/InMemoryDOMStoreThreePhaseCommitCohort.java | 2 ++ pom.xml | 2 +- 90 files changed, 197 insertions(+), 255 deletions(-) diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml index cb31cfc94d..d2b7401727 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 7988f8a697..4b5af9f41a 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 c01b6e1ab8..339164e8b6 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 d0790731e9..ecc028f2c4 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 f44c72df37..b368ef3288 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 da7a1f942f..b9a02142f4 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 481b87939d..75ee74cb97 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 db813f12c9..838e1e6db4 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 dfbf9c1eb6..5213b4665a 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 ce8110484b..bdfb932fef 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 0607a1e940..100db8f87c 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 499d2d6f72..747b59c566 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 6dc7d9be35..ad736a3fc0 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 26b6c7d341..c657fbc472 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 b8b7603004..884a3cfbe4 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 e86073cd11..96ba9b2caf 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 4398d46224..7176170988 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 0d4db2f175..f6640b8bc4 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 18e885be6d..a720ad0d1d 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 7d9bac2378..0b9b8bafb4 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 434358b225..bf45aabe84 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 507b120716..53d6527a7f 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 a1f5c2fdfc..297d215f93 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 755efc01b8..806543de3d 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.2 + 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 bb0eaa1ed1..e42fc8086f 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 984c8238cf..81e7126cb0 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 623b9c30ee..797522713f 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 ef35d577d2..c8799ce301 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 a4e0084167..2d0f211324 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 6d847de326..b3f728f21a 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 1071d809b7..f464b20fb7 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 9b276a34db..a13663ffc9 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 37b68c3994..2b8554fdce 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 b12889396b..83d5e4fc79 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 9ae27a7770..0375f06636 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.2 + 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 19ec3e65cc..d6be56220e 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 68352c6660..22340f64cc 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 3ae1b7142d..fa77b4c2d1 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 7c05be5c60..51d138a734 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 3b4a49f385..a8d270f286 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 9f1ba97da9..8f0291bea7 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 f3d84107e8..77ee4d0e7a 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 c4c945a885..d8dbacc6d0 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 11373137d1..42e7546897 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 1797124001..29f12e85e5 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 e062632378..6da4c1ac7a 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 e908bd3d2d..156c16b4c5 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.13.0-SNAPSHOT 1.8.0-SNAPSHOT 1.8.0-SNAPSHOT - 2.0.2 + 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 bb4c133834..792cc33edc 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 c777953838..3e319694c1 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 af67449ab7..1a26a4f8b0 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 d5c6d326a6..197e4b8e40 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 6f90b8645b..da318568b8 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 2724e0d27b..f14ee4ebc2 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.2 + 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 95dbf8b51a..da3bae46c5 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/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml index 57d0f75c48..4424c51d76 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 2f3ac6f511..35c15caa64 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 a0af417671..1c0e0540dc 100644 --- a/opendaylight/config/config-parent/pom.xml +++ b/opendaylight/config/config-parent/pom.xml @@ -6,8 +6,7 @@ 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 --> - + org.opendaylight.mdsal binding-parent @@ -24,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.9.0-SNAPSHOT 1.8.0-SNAPSHOT - 2.0.2 + 2.0.3 ${project.build.directory}/generated-sources/config-binding src/main/config/default-config.xml @@ -49,7 +48,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - ${yangtools.version} + 2.0.3 pom import @@ -83,7 +82,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} + 2.0.3 org.opendaylight.controller diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml index 9ea38fd313..be756ad855 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 ba9822f25f..cd2106633a 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 fc607274b3..38380dc59c 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -1,5 +1,6 @@ - + +