From: Robert Varga Date: Fri, 29 May 2020 17:32:34 +0000 (+0200) Subject: Bump odlparent/yangtools/mdsal X-Git-Tag: v2.0.1~1 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=26a9c080628e16e47bba578979cd7c406a455a92 Bump odlparent/yangtools/mdsal Adopt updates from odlparent-7.0.2, yangtools-5.0.2, mdsal-6.0.1. This improves dependency layout, leading to leaner features. Also adjust for internals of IMDS being promoted to SPI -- disconnecting CDS from IMDS. Change-Id: Ia6c47206771f2f513d71f0b435512f638c597282 Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d137c49faa..ff7991c29b 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 1045650197..a6530ae5aa 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/docs/pom.xml b/docs/pom.xml index 1b96cb1773..54dc604654 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 @@ -230,9 +230,9 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/7.0.1/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/5.0.1/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/6.0.0/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/7.0.2/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/5.0.2/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/6.0.1/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index 99992c812f..3dfcd82f88 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index a654e4e812..00088fb5ee 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index 76859e5749..6fb4ad85a4 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features/pom.xml b/features/pom.xml index 9fbde86a4a..a85b89f636 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index 5cb86cc417..c8cad4177f 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 57d1dfa0d6..960a7d114b 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 7923f14c20..62ca772762 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.1 + 5.0.2 pom import org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 pom import @@ -94,41 +94,18 @@ org.osgi org.osgi.service.event - - junit - junit - test - + com.google.truth truth - test org.opendaylight.mdsal mdsal-binding-test-model - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test-jar - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-generator-impl - test org.opendaylight.mdsal - mdsal-binding-runtime-spi - test + mdsal-binding-test-utils diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index 23dbec038f..8ce5fc362c 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index e3c956ee33..5024778461 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index c17ec2247d..78f3e69882 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index cb1e89f1ce..029c82856f 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index a580bb23c9..8bc6ac566f 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index d31ff7a1c2..639f33d61f 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index 36ca53cdec..d39573457f 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 59d4008d13..50abcc994e 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 9f97328f94..c39c45ccbb 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 4eba3e5622..8e3bb6fdb7 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 6.0.0 + 6.0.1 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 3f78be8c7e..3817845e30 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 5c3525efc5..95089c6657 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 - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index e934da0025..918353c164 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -126,7 +126,7 @@ org.opendaylight.mdsal - mdsal-binding-dom-codec + mdsal-binding-dom-codec-api org.opendaylight.mdsal @@ -169,10 +169,6 @@ org.apache.commons commons-text - - org.opendaylight.mdsal - mdsal-dom-inmemory-datastore - io.atomix @@ -207,13 +203,7 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl - test - - - org.opendaylight.mdsal - mdsal-binding-runtime-spi - test + mdsal-binding-test-utils diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactoryBuilder.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactoryBuilder.java index 15459ce09c..42b972318b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactoryBuilder.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactoryBuilder.java @@ -9,13 +9,13 @@ package org.opendaylight.controller.cluster.sharding; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.mdsal.dom.store.inmemory.ShardDataModificationFactoryBuilder; +import org.opendaylight.mdsal.dom.spi.shard.AbstractShardModificationFactoryBuilder; /** * Builder for {@link DistributedShardModificationFactory}. */ public class DistributedShardModificationFactoryBuilder - extends ShardDataModificationFactoryBuilder { + extends AbstractShardModificationFactoryBuilder { public DistributedShardModificationFactoryBuilder(final DOMDataTreeIdentifier root) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java index f60fac4059..c0d32c91a9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java @@ -28,8 +28,8 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.mdsal.dom.spi.shard.DOMDataTreeShardWriteTransaction; import org.opendaylight.mdsal.dom.spi.shard.ForeignShardModificationContext; +import org.opendaylight.mdsal.dom.spi.shard.ForeignShardThreePhaseCommitCohort; import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; -import org.opendaylight.mdsal.dom.store.inmemory.ForeignShardThreePhaseCommitCohort; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index 7d5ccabb86..bf086f75fb 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index 065d111e6b..608a30a85b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 2ebb9210c7..5980f0a9a3 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index 96f462e5de..36bcc21d9a 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -33,24 +33,7 @@ org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - - - org.opendaylight.mdsal - mdsal-binding-generator-impl - test - - - org.opendaylight.mdsal - mdsal-binding-runtime-spi - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test-jar - test + mdsal-binding-test-utils diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml index 75dab2e6aa..14de066627 100644 --- a/opendaylight/model/model-inventory/pom.xml +++ b/opendaylight/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 6.0.0 + 6.0.1 diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml index 3d0292bedc..718d510069 100644 --- a/opendaylight/model/pom.xml +++ b/opendaylight/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pom.xml b/pom.xml index 9828eae277..f91ceebfda 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2