From b95285098ab2090d36095c69fc838d4df4d61300 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 11 Oct 2017 20:54:53 +0200 Subject: [PATCH] Bump yangtools to 2.0.0 This bumps odlparent to 3.0.1 and yangtools to 2.0.0. Also fixes references to features, so that the build reactor is consistent. Compilation fixes are addressed in a follow-up patch. Change-Id: I24f9997c2ec22861e674b74fb01d43f783e3dbc1 Signed-off-by: Robert Varga --- benchmark/artifacts/pom.xml | 2 +- benchmark/pom.xml | 2 +- .../features-mdsal-benchmark/pom.xml | 2 +- features/benchmark/odl-benchmark-api/pom.xml | 2 +- features/benchmark/odl-dsbenchmark/pom.xml | 2 +- .../benchmark/odl-mdsal-benchmark/pom.xml | 2 +- features/benchmark/odl-ntfbenchmark/pom.xml | 2 +- features/benchmark/pom.xml | 2 +- .../features-config-netty/pom.xml | 2 +- .../config-netty/odl-config-netty/pom.xml | 2 +- features/config-netty/pom.xml | 2 +- .../features-config-persister/pom.xml | 2 +- .../odl-config-manager-facade-xml/pom.xml | 2 +- .../odl-config-persister-all/pom.xml | 2 +- .../odl-config-persister/pom.xml | 2 +- .../odl-config-startup/pom.xml | 2 +- features/config-persister/pom.xml | 2 +- features/config/features-config/pom.xml | 2 +- features/config/odl-config-all/pom.xml | 2 +- features/config/odl-config-api/pom.xml | 2 +- features/config/odl-config-core/pom.xml | 4 ++-- features/config/odl-config-manager/pom.xml | 2 +- .../odl-config-netty-config-api/pom.xml | 4 ++-- features/config/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 +- .../mdsal/odl-clustering-test-app/pom.xml | 2 +- features/mdsal/odl-mdsal-all/pom.xml | 2 +- features/mdsal/odl-mdsal-broker-local/pom.xml | 12 ++++++++--- features/mdsal/odl-mdsal-broker/pom.xml | 2 +- .../odl-mdsal-clustering-commons/pom.xml | 11 +++++----- features/mdsal/odl-mdsal-clustering/pom.xml | 2 +- features/mdsal/odl-mdsal-common/pom.xml | 6 +++--- .../odl-mdsal-distributed-datastore/pom.xml | 2 +- .../mdsal/odl-mdsal-model-inventory/pom.xml | 2 +- .../odl-mdsal-remoterpc-connector/pom.xml | 4 ++-- .../mdsal/odl-message-bus-collector/pom.xml | 2 +- features/mdsal/odl-toaster/pom.xml | 4 ++-- features/mdsal/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- .../archetype-resources/artifacts/pom.xml | 2 +- .../features/features-X/pom.xml | 4 ++-- .../features/odl-X-api/pom.xml | 2 +- .../features/odl-X-cli/pom.xml | 2 +- .../features/odl-X-rest/pom.xml | 2 +- .../features/odl-X/pom.xml | 2 +- .../archetype-resources/features/pom.xml | 2 +- .../archetype-resources/karaf/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- opendaylight/archetypes/pom.xml | 4 ++-- opendaylight/blueprint/pom.xml | 4 ++-- opendaylight/commons/jolokia/pom.xml | 2 +- opendaylight/commons/liblldp/pom.xml | 2 +- opendaylight/config/config-it-base/pom.xml | 2 +- .../config/config-netty-config/pom.xml | 2 +- opendaylight/config/config-parent/pom.xml | 2 +- .../md-sal/benchmark-data-store/pom.xml | 4 ++-- opendaylight/md-sal/cds-access-api/pom.xml | 8 ++++---- opendaylight/md-sal/cds-access-client/pom.xml | 8 ++++---- opendaylight/md-sal/cds-dom-api/pom.xml | 6 +++--- 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 | 2 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 4 ++-- .../md-sal/mdsal-trace/binding-impl/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/cli/pom.xml | 2 +- .../features/features-mdsal-trace/pom.xml | 2 +- .../features/odl-mdsal-trace/pom.xml | 2 +- .../md-sal/mdsal-trace/features/pom.xml | 2 +- opendaylight/md-sal/mdsal-trace/pom.xml | 2 +- opendaylight/md-sal/messagebus-config/pom.xml | 2 +- opendaylight/md-sal/messagebus-util/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../md-sal/sal-akka-raft-example/pom.xml | 2 +- opendaylight/md-sal/sal-akka-raft/pom.xml | 14 ++++++------- opendaylight/md-sal/sal-binding-api/pom.xml | 4 ++-- .../md-sal/sal-binding-broker/pom.xml | 4 ++-- .../md-sal/sal-binding-dom-it/pom.xml | 4 ++-- opendaylight/md-sal/sal-binding-util/pom.xml | 2 +- .../md-sal/sal-cluster-admin-impl/pom.xml | 4 ++-- .../md-sal/sal-clustering-commons/pom.xml | 16 +++++++-------- .../md-sal/sal-clustering-config/pom.xml | 2 +- opendaylight/md-sal/sal-common-impl/pom.xml | 4 ++-- .../md-sal/sal-common-testutil/pom.xml | 4 ++-- opendaylight/md-sal/sal-common-util/pom.xml | 4 ++-- opendaylight/md-sal/sal-connector-api/pom.xml | 4 ++-- .../md-sal/sal-distributed-datastore/pom.xml | 16 +++++++-------- opendaylight/md-sal/sal-dom-api/pom.xml | 4 ++-- opendaylight/md-sal/sal-dom-broker/pom.xml | 4 ++-- opendaylight/md-sal/sal-dom-spi/pom.xml | 2 +- .../sal-dummy-distributed-datastore/pom.xml | 16 +++++++-------- .../md-sal/sal-inmemory-datastore/pom.xml | 2 +- .../md-sal/sal-remoterpc-connector/pom.xml | 20 ++++++++++--------- .../md-sal/sal-schema-service/pom.xml | 4 ++-- .../md-sal/samples/toaster-consumer/pom.xml | 2 +- pom.xml | 2 +- 100 files changed, 180 insertions(+), 171 deletions(-) diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml index e8be844a42..07640b071b 100644 --- a/benchmark/artifacts/pom.xml +++ b/benchmark/artifacts/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index a10649ae16..8846d33b35 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 - 2.0.5 + 3.0.1 org.opendaylight.controller diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml index 480c467c3d..1cb91c5879 100644 --- a/features/benchmark/features-mdsal-benchmark/pom.xml +++ b/features/benchmark/features-mdsal-benchmark/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index 069f9aa52c..ba96423eeb 100644 --- a/features/benchmark/odl-benchmark-api/pom.xml +++ b/features/benchmark/odl-benchmark-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml index 15ac9fb6da..56ed08cc43 100644 --- a/features/benchmark/odl-dsbenchmark/pom.xml +++ b/features/benchmark/odl-dsbenchmark/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml index 39961afd30..8a791e5ad2 100644 --- a/features/benchmark/odl-mdsal-benchmark/pom.xml +++ b/features/benchmark/odl-mdsal-benchmark/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml index 5e525288bc..6570d9ec81 100644 --- a/features/benchmark/odl-ntfbenchmark/pom.xml +++ b/features/benchmark/odl-ntfbenchmark/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml index 89c6339f54..d9c66c4ac7 100644 --- a/features/benchmark/pom.xml +++ b/features/benchmark/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 org.opendaylight.controller diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml index 39a239a111..2b18cb6904 100644 --- a/features/config-netty/features-config-netty/pom.xml +++ b/features/config-netty/features-config-netty/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml index 159793dfbc..d7b37b77bf 100644 --- a/features/config-netty/odl-config-netty/pom.xml +++ b/features/config-netty/odl-config-netty/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index 28c1965982..fde2ccd6a8 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/features/config-persister/features-config-persister/pom.xml b/features/config-persister/features-config-persister/pom.xml index d9fcb530e4..db7843f65d 100644 --- a/features/config-persister/features-config-persister/pom.xml +++ b/features/config-persister/features-config-persister/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 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 53d0a5811c..dd6420ba9b 100644 --- a/features/config-persister/odl-config-manager-facade-xml/pom.xml +++ b/features/config-persister/odl-config-manager-facade-xml/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config-persister/odl-config-persister-all/pom.xml b/features/config-persister/odl-config-persister-all/pom.xml index f29c60367f..285b9ff210 100644 --- a/features/config-persister/odl-config-persister-all/pom.xml +++ b/features/config-persister/odl-config-persister-all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config-persister/odl-config-persister/pom.xml b/features/config-persister/odl-config-persister/pom.xml index a51716af6f..457fb0c868 100644 --- a/features/config-persister/odl-config-persister/pom.xml +++ b/features/config-persister/odl-config-persister/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config-persister/odl-config-startup/pom.xml b/features/config-persister/odl-config-startup/pom.xml index 3a4e9cc6ed..f2f903463a 100644 --- a/features/config-persister/odl-config-startup/pom.xml +++ b/features/config-persister/odl-config-startup/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml index 7527faf057..82e3cc48d5 100644 --- a/features/config-persister/pom.xml +++ b/features/config-persister/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/features/config/features-config/pom.xml b/features/config/features-config/pom.xml index 54bbb9e203..faa4a5d87a 100644 --- a/features/config/features-config/pom.xml +++ b/features/config/features-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 diff --git a/features/config/odl-config-all/pom.xml b/features/config/odl-config-all/pom.xml index 2012641d95..1a9c1a78fb 100644 --- a/features/config/odl-config-all/pom.xml +++ b/features/config/odl-config-all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config/odl-config-api/pom.xml b/features/config/odl-config-api/pom.xml index 48a8347215..8f2854ffd2 100644 --- a/features/config/odl-config-api/pom.xml +++ b/features/config/odl-config-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config/odl-config-core/pom.xml b/features/config/odl-config-core/pom.xml index c904078679..b1e9a104f1 100644 --- a/features/config/odl-config-core/pom.xml +++ b/features/config/odl-config-core/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -28,7 +28,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/features/config/odl-config-manager/pom.xml b/features/config/odl-config-manager/pom.xml index 1caa137bbc..2835d533c6 100644 --- a/features/config/odl-config-manager/pom.xml +++ b/features/config/odl-config-manager/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/config/odl-config-netty-config-api/pom.xml b/features/config/odl-config-netty-config-api/pom.xml index 7cb5ed88ca..d45d6e5098 100644 --- a/features/config/odl-config-netty-config-api/pom.xml +++ b/features/config/odl-config-netty-config-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -34,7 +34,7 @@ org.opendaylight.odlparent odl-netty-4 - 2.0.5 + 3.0.1 xml features diff --git a/features/config/pom.xml b/features/config/pom.xml index 692fc39158..f025b00e87 100644 --- a/features/config/pom.xml +++ b/features/config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml index 23128e4034..e8641b16de 100644 --- a/features/extras/features-extras/pom.xml +++ b/features/extras/features-extras/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml index d6e5b123c5..b344efd871 100644 --- a/features/extras/odl-extras-all/pom.xml +++ b/features/extras/odl-extras-all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml index 3728af30d2..cbaffc5cbf 100644 --- a/features/extras/odl-jolokia/pom.xml +++ b/features/extras/odl-jolokia/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 493bc2bad5..b2fe386e2c 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml index dd5664ebe5..b673ba8d37 100644 --- a/features/mdsal/features-mdsal/pom.xml +++ b/features/mdsal/features-mdsal/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index e7a829df08..972e763ec4 100644 --- a/features/mdsal/odl-clustering-test-app/pom.xml +++ b/features/mdsal/odl-clustering-test-app/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml index ddc1a85df7..6a5a99e66a 100644 --- a/features/mdsal/odl-mdsal-all/pom.xml +++ b/features/mdsal/odl-mdsal-all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 9b86c4fa67..5d9a882b20 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -36,14 +36,14 @@ org.opendaylight.odlparent odlparent-artifacts - 2.0.5 + 3.0.1 pom import org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -92,6 +92,12 @@ xml features + + org.opendaylight.yangtools + odl-yangtools-codec + xml + features + org.opendaylight.mdsal odl-mdsal-binding-dom-adapter diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index cb884a3362..9b62aaa3b0 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml index 8d090db98e..5489a8189b 100644 --- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml +++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -28,7 +28,7 @@ org.opendaylight.odlparent odlparent-artifacts - 2.0.5 + 3.0.1 pom import @@ -45,19 +45,19 @@ org.opendaylight.odlparent - odl-akka-system-2.4 + odl-akka-system-2.5 xml features org.opendaylight.odlparent - odl-akka-persistence-2.4 + odl-akka-persistence-2.5 xml features org.opendaylight.odlparent - odl-akka-clustering-2.4 + odl-akka-clustering-2.5 xml features @@ -74,6 +74,7 @@ io.dropwizard.metrics metrics-core + 3.1.2 diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml index 5468350016..2545640e09 100644 --- a/features/mdsal/odl-mdsal-clustering/pom.xml +++ b/features/mdsal/odl-mdsal-clustering/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-common/pom.xml b/features/mdsal/odl-mdsal-common/pom.xml index de8d3f202f..f8dc5b2a6f 100644 --- a/features/mdsal/odl-mdsal-common/pom.xml +++ b/features/mdsal/odl-mdsal-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -28,8 +28,8 @@ org.opendaylight.yangtools - odl-yangtools-yang-data - 1.2.0 + odl-yangtools-data + 2.0.0 xml features diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index 3cef857134..80243a19f1 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index 579ded9e13..fa952b4d6a 100644 --- a/features/mdsal/odl-mdsal-model-inventory/pom.xml +++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml index ad372a6ee8..e26f1f886f 100644 --- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml +++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -41,7 +41,7 @@ org.opendaylight.odlparent odl-akka-leveldb-0.7 - 2.0.5 + 3.0.1 xml features diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index f2ec75e3af..6dfdae3c73 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index 7fb2ea0354..1757597063 100644 --- a/features/mdsal/odl-toaster/pom.xml +++ b/features/mdsal/odl-toaster/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 @@ -29,7 +29,7 @@ org.opendaylight.yangtools odl-yangtools-common - 1.2.0 + 2.0.0 xml features diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 2a4770325b..26159a38db 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/features/pom.xml b/features/pom.xml index 837ce12308..b3e85bcf80 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/karaf/pom.xml b/karaf/pom.xml index 9fcf2607e0..1303669197 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 2.0.5 + 3.0.1 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 a6a80c98d4..2a5d3e0fa8 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml index 3951aadbe7..cc53144bf7 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/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 - 2.0.5 + 3.0.1 @@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.12.0-SNAPSHOT 1.7.0-SNAPSHOT 1.7.0-SNAPSHOT - 1.2.0 + 2.0.0 etc/opendaylight/karaf diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml index 2b02b4ab77..d9ca96af67 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml index 69d4c17c34..cf78aebd91 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml index 07eea3f430..44430501b7 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml index d79d04711c..c8d3dc9274 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 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 3760c1771f..ea1c23bd42 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 - 2.0.5 + 3.0.1 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 73ef893e41..c22b64cf11 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 - 2.0.5 + 3.0.1 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 f52815f35d..d247fcb7d3 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 81a544944b..c01d2e08ca 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ 3.0.1 + ArtifactResolutionException: Error resolving artifact org.opendaylight.odlparent:opendaylight-karaf-empty:zip:3.0.1 --> true diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index b175ed4b3c..0ccff3c245 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index 21699ff1f3..aa2353df5e 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.1 diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml index 4dc1e0a4ed..5f33289baf 100644 --- a/opendaylight/commons/liblldp/pom.xml +++ b/opendaylight/commons/liblldp/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml index 8bacbac1e6..54237b7dc0 100644 --- a/opendaylight/config/config-it-base/pom.xml +++ b/opendaylight/config/config-it-base/pom.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - 2.0.5 + 3.0.1 diff --git a/opendaylight/config/config-netty-config/pom.xml b/opendaylight/config/config-netty-config/pom.xml index b7e8269116..cb83418b6a 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml index 72a416cb4c..2f041cf3ba 100644 --- a/opendaylight/config/config-parent/pom.xml +++ b/opendaylight/config/config-parent/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.8.0-SNAPSHOT 1.7.0-SNAPSHOT - 1.2.0 + 2.0.0 ${project.build.directory}/generated-sources/config-binding src/main/config/default-config.xml diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml index fc024f131f..92b4808f39 100644 --- a/opendaylight/md-sal/benchmark-data-store/pom.xml +++ b/opendaylight/md-sal/benchmark-data-store/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.1 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml index 2a0184b93d..e7e26cbbf9 100644 --- a/opendaylight/md-sal/cds-access-api/pom.xml +++ b/opendaylight/md-sal/cds-access-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -40,7 +40,7 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 @@ -65,7 +65,7 @@ com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml index 72aa9408b0..6aa9c11cb1 100644 --- a/opendaylight/md-sal/cds-access-client/pom.xml +++ b/opendaylight/md-sal/cds-access-client/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -44,7 +44,7 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 @@ -62,7 +62,7 @@ com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml index 5179a9c153..aafeb0a8de 100644 --- a/opendaylight/md-sal/cds-dom-api/pom.xml +++ b/opendaylight/md-sal/cds-dom-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -19,7 +19,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -40,7 +40,7 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml index 947019907f..1148c9df45 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 7a48c9aa19..13aeaafd04 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 98b84fc500..1826304610 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 4.0.0 diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 6963cd23c5..bc292f136c 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 4.0.0 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.7.0-SNAPSHOT org.opendaylight.odlparent opendaylight-karaf-empty - 2.0.5 + 3.0.1 zip false diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml index a1566fc276..7d87c626a1 100644 --- a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/mdsal-trace/cli/pom.xml b/opendaylight/md-sal/mdsal-trace/cli/pom.xml index 1f93c0dbf0..94e8aedd75 100644 --- a/opendaylight/md-sal/mdsal-trace/cli/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/cli/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 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 2fb9511324..b205e8f082 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 @@ -7,7 +7,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.1 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 3841aa8a4d..a5242f0939 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 @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml index 64a444ba14..1590d08f9a 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml index 8b1c185fc5..38fb991d19 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml index d11cec72b8..547a9d4c1b 100644 --- a/opendaylight/md-sal/messagebus-config/pom.xml +++ b/opendaylight/md-sal/messagebus-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index be8a642273..b77450d229 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 05dc15dc31..19cc004617 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml index d8d39441fb..308d946dad 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml index 77c352284e..315484d2de 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -37,27 +37,27 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-cluster_${scala.version} + akka-cluster_2.12 com.typesafe.akka - akka-persistence_${scala.version} + akka-persistence_2.12 com.typesafe.akka - akka-remote_${scala.version} + akka-remote_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test @@ -83,7 +83,7 @@ com.typesafe.akka - akka-slf4j_${scala.version} + akka-slf4j_2.12 diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index b95103c95d..b5a91eab55 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index fdcd03f341..baa612aa02 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index faac86e538..69a52a2b4a 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 - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml index 9dc73ff87d..bea70b098c 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml index bcb3eb13e2..a335480d00 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml @@ -73,11 +73,11 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index 90d4001a64..e8dcede8d2 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -54,35 +54,35 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-cluster_${scala.version} + akka-cluster_2.12 com.typesafe.akka - akka-osgi_${scala.version} + akka-osgi_2.12 com.typesafe.akka - akka-persistence_${scala.version} + akka-persistence_2.12 com.typesafe.akka - akka-remote_${scala.version} + akka-remote_2.12 com.typesafe.akka - akka-slf4j_${scala.version} + akka-slf4j_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 com.typesafe.akka - akka-persistence-tck_${scala.version} + akka-persistence-tck_2.12 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index a81ecdfab3..925ddbf8a5 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 - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index 2f9a3de95b..0390e3ab60 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-common-testutil/pom.xml b/opendaylight/md-sal/sal-common-testutil/pom.xml index 97d329c220..0e8722657b 100644 --- a/opendaylight/md-sal/sal-common-testutil/pom.xml +++ b/opendaylight/md-sal/sal-common-testutil/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.1 @@ -27,7 +27,7 @@ org.opendaylight.yangtools testutils - 1.2.0 + 2.0.0 diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index b4ea8d5e5a..c24b47bcd0 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index bbae72a939..7e8c2fb7b2 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 585aa0bf9b..549e6778d5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -38,35 +38,35 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-cluster_${scala.version} + akka-cluster_2.12 com.typesafe.akka - akka-osgi_${scala.version} + akka-osgi_2.12 com.typesafe.akka - akka-persistence_${scala.version} + akka-persistence_2.12 com.typesafe.akka - akka-remote_${scala.version} + akka-remote_2.12 com.typesafe.akka - akka-slf4j_${scala.version} + akka-slf4j_2.12 org.scala-lang.modules - scala-java8-compat_${scala.version} + scala-java8-compat_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index 748a7a3f52..7963456795 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 23b80c83a1..4c1b3fc366 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml index c2346b5c15..dc67b1b2b2 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml index 0a6e7c6301..c689276d58 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -33,38 +33,38 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-cluster_${scala.version} + akka-cluster_2.12 com.typesafe.akka - akka-persistence_${scala.version} + akka-persistence_2.12 com.typesafe.akka - akka-remote_${scala.version} + akka-remote_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test com.typesafe.akka - akka-slf4j_${scala.version} + akka-slf4j_2.12 com.typesafe.akka - akka-osgi_${scala.version} + akka-osgi_2.12 diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index d6556bea07..49208d5fd2 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index 538841ecd5..efc46e542f 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -26,7 +26,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import @@ -40,32 +40,32 @@ com.typesafe.akka - akka-actor_${scala.version} + akka-actor_2.12 com.typesafe.akka - akka-cluster_${scala.version} + akka-cluster_2.12 com.typesafe.akka - akka-remote_${scala.version} + akka-remote_2.12 com.typesafe.akka - akka-testkit_${scala.version} + akka-testkit_2.12 test com.typesafe.akka - akka-osgi_${scala.version} + akka-osgi_2.12 com.typesafe.akka - akka-slf4j_${scala.version} + akka-slf4j_2.12 com.typesafe.akka - akka-persistence_${scala.version} + akka-persistence_2.12 @@ -124,10 +124,12 @@ io.dropwizard.metrics metrics-core + 3.1.2 io.dropwizard.metrics metrics-graphite + 3.1.2 diff --git a/opendaylight/md-sal/sal-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml index 551b95ca1c..d68a00dc69 100644 --- a/opendaylight/md-sal/sal-schema-service/pom.xml +++ b/opendaylight/md-sal/sal-schema-service/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yangtools-artifacts - 1.2.0 + 2.0.0 pom import diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index ba069d0967..6654e437de 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.1 diff --git a/pom.xml b/pom.xml index 6fe6bfa59e..197022abbe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.1 org.opendaylight.controller -- 2.36.6