From cef02da9c0dc66905864ff68b1968fc43742a284 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 2 Sep 2015 16:13:30 +0200 Subject: [PATCH] Migration to use MD-SAL Project Change-Id: Ib5e2ef6e7e80ac749bea4dcd0e1b92ad518e9c13 Signed-off-by: Tony Tkacik --- bgp/bmp-api/pom.xml | 6 ++-- bgp/bmp-impl/pom.xml | 14 ++++---- bgp/bmp-spi/pom.xml | 6 ++-- bgp/concepts/pom.xml | 4 +-- bgp/flowspec/pom.xml | 4 +-- bgp/inet/pom.xml | 4 +-- bgp/linkstate/pom.xml | 4 +-- bgp/parser-api/pom.xml | 4 +-- bgp/parser-impl/pom.xml | 4 +-- bgp/parser-mock/pom.xml | 4 +-- bgp/parser-spi/pom.xml | 4 +-- bgp/rib-api/pom.xml | 4 +-- bgp/rib-impl/pom.xml | 8 ++--- bgp/rib-mock/pom.xml | 4 +-- bgp/rib-spi/pom.xml | 8 ++--- bgp/testtool/pom.xml | 4 +-- bgp/topology-provider/pom.xml | 14 ++++---- bgp/util/pom.xml | 2 +- concepts/pom.xml | 6 ++-- data-change-counter/pom.xml | 4 +-- features/bgp/pom.xml | 17 +++++++++ features/bgp/src/main/features/features.xml | 4 ++- features/bmp/pom.xml | 35 ++++++++++++------- features/bmp/src/main/features/features.xml | 2 +- features/extras/pom.xml | 12 ++++++- .../extras/src/main/features/features.xml | 4 +-- features/pcep/pom.xml | 18 +++++++++- features/pcep/src/main/features/features.xml | 4 +-- integration-tests/pom.xml | 19 ++++++---- .../pcep/AbstractPcepOsgiTest.java | 2 +- parent/pom.xml | 22 +++++++++++- pcep/api/pom.xml | 4 +-- pcep/ietf-stateful07/pom.xml | 8 ++--- pcep/impl/pom.xml | 4 +-- pcep/pcc-mock/pom.xml | 2 +- pcep/segment-routing/pom.xml | 6 ++-- pcep/spi/pom.xml | 2 +- pcep/topology-api/pom.xml | 6 ++-- pcep/topology-provider/pom.xml | 6 ++-- pcep/tunnel-api/pom.xml | 4 +-- pcep/tunnel-provider/pom.xml | 8 ++--- programming/api/pom.xml | 4 +-- programming/impl/pom.xml | 6 ++-- programming/spi/pom.xml | 2 +- programming/topology-api/pom.xml | 4 +-- programming/tunnel-api/pom.xml | 4 +-- rsvp/api/pom.xml | 4 +-- topology/api/pom.xml | 6 ++-- topology/segment-routing/pom.xml | 4 +-- topology/tunnel-api/pom.xml | 6 ++-- util/pom.xml | 2 +- 51 files changed, 212 insertions(+), 131 deletions(-) diff --git a/bgp/bmp-api/pom.xml b/bgp/bmp-api/pom.xml index 763f326ed1..0f29233e30 100644 --- a/bgp/bmp-api/pom.xml +++ b/bgp/bmp-api/pom.xml @@ -31,11 +31,11 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types @@ -47,7 +47,7 @@ guava - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/bgp/bmp-impl/pom.xml b/bgp/bmp-impl/pom.xml index 9dc8232cc5..70ebfe5961 100644 --- a/bgp/bmp-impl/pom.xml +++ b/bgp/bmp-impl/pom.xml @@ -73,7 +73,7 @@ tcpmd5-netty - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -101,12 +101,12 @@ sal-core-api - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl - org.opendaylight.yangtools - binding-data-codec + org.opendaylight.mdsal + mdsal-binding-dom-codec org.opendaylight.controller @@ -153,11 +153,11 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/bmp-spi/pom.xml b/bgp/bmp-spi/pom.xml index 2c833cb4c3..159716a6d9 100644 --- a/bgp/bmp-spi/pom.xml +++ b/bgp/bmp-spi/pom.xml @@ -63,11 +63,11 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types @@ -87,7 +87,7 @@ config-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml index e904a30394..f00009a38f 100644 --- a/bgp/concepts/pom.xml +++ b/bgp/concepts/pom.xml @@ -50,7 +50,7 @@ be here, but the plugin should bring it in. --> - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -68,7 +68,7 @@ discovered by the plugin. --> - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml index 5d9399cc19..c4feaae980 100644 --- a/bgp/flowspec/pom.xml +++ b/bgp/flowspec/pom.xml @@ -75,7 +75,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -87,7 +87,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index ee596babb8..f0f7d9b89d 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -42,7 +42,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -55,7 +55,7 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml index 2a17006a48..f9811919f8 100644 --- a/bgp/linkstate/pom.xml +++ b/bgp/linkstate/pom.xml @@ -75,7 +75,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -87,7 +87,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml index f2d4c7f3d9..19bdff02f8 100644 --- a/bgp/parser-api/pom.xml +++ b/bgp/parser-api/pom.xml @@ -54,7 +54,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -67,7 +67,7 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml index 5391ad4e73..4b8846b4f2 100644 --- a/bgp/parser-impl/pom.xml +++ b/bgp/parser-impl/pom.xml @@ -70,11 +70,11 @@ guava - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml index 568eab109a..5ef14f1fab 100644 --- a/bgp/parser-mock/pom.xml +++ b/bgp/parser-mock/pom.xml @@ -49,11 +49,11 @@ netty-buffer - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types test diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml index edce8227d8..d32080bcba 100644 --- a/bgp/parser-spi/pom.xml +++ b/bgp/parser-spi/pom.xml @@ -63,7 +63,7 @@ config-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -75,7 +75,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml index 6cfbf7b021..b2b8f30222 100644 --- a/bgp/rib-api/pom.xml +++ b/bgp/rib-api/pom.xml @@ -45,7 +45,7 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -61,7 +61,7 @@ config-api - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml index 5df4ce00da..6878145356 100644 --- a/bgp/rib-impl/pom.xml +++ b/bgp/rib-impl/pom.xml @@ -105,7 +105,7 @@ protocol-framework - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -129,7 +129,7 @@ yang-data-impl - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types @@ -150,8 +150,8 @@ sal-binding-config - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl org.opendaylight.controller diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml index 71809009e7..3684bb8d5f 100644 --- a/bgp/rib-mock/pom.xml +++ b/bgp/rib-mock/pom.xml @@ -54,11 +54,11 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml index dea4617b96..2c812ab4e7 100644 --- a/bgp/rib-spi/pom.xml +++ b/bgp/rib-spi/pom.xml @@ -53,11 +53,11 @@ bgp-inet - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -77,8 +77,8 @@ sal-core-api - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl org.slf4j diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml index 477e83215f..2ed2986fca 100644 --- a/bgp/testtool/pom.xml +++ b/bgp/testtool/pom.xml @@ -63,11 +63,11 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml index 4a28de8c1c..1a1c67a4df 100644 --- a/bgp/topology-provider/pom.xml +++ b/bgp/topology-provider/pom.xml @@ -77,7 +77,7 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -102,27 +102,27 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-ted - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology-isis - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology-ospf - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology-l3-unicast-igp - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml index 606981979c..fb1c5b0a3a 100644 --- a/bgp/util/pom.xml +++ b/bgp/util/pom.xml @@ -59,7 +59,7 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types test diff --git a/concepts/pom.xml b/concepts/pom.xml index 9abc14bba4..24daacd498 100644 --- a/concepts/pom.xml +++ b/concepts/pom.xml @@ -51,7 +51,7 @@ be here, but the plugin should bring it in. --> - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types @@ -75,7 +75,7 @@ test - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology test diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml index c268717dc4..2ac6b9f407 100644 --- a/data-change-counter/pom.xml +++ b/data-change-counter/pom.xml @@ -32,7 +32,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -58,7 +58,7 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index 8e1df4fd80..1834b00f49 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -25,6 +25,7 @@ 0.8.0-SNAPSHOT 1.3.0-SNAPSHOT + 0.8.0-SNAPSHOT 0.4.0-SNAPSHOT 1.6.0-SNAPSHOT 0.7.0-SNAPSHOT @@ -91,6 +92,22 @@ features xml + + org.opendaylight.mdsal + features-mdsal + 2.0.0-SNAPSHOT + features + xml + runtime + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + org.opendaylight.controller features-mdsal diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml index 34cee5e768..1538a12a2d 100644 --- a/features/bgp/src/main/features/features.xml +++ b/features/bgp/src/main/features/features.xml @@ -17,6 +17,8 @@ mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features + odl-bgpcep-bgp @@ -36,7 +38,7 @@ mvn:com.google.guava/guava/{{VERSION}} - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.bgpcep/concepts/{{VERSION}} mvn:commons-codec/commons-codec/{{VERSION}} diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index 2fccd08ffb..c7ffb23adf 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -1,25 +1,26 @@ - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.6.0-SNAPSHOT - - - features-bmp - org.opendaylight.bgpcep - 0.5.0-SNAPSHOT + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.6.0-SNAPSHOT + + + features-bmp + org.opendaylight.bgpcep + 0.5.0-SNAPSHOT 0.8.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.8.0-SNAPSHOT 0.4.0-SNAPSHOT 1.6.0-SNAPSHOT 0.7.0-SNAPSHOT 1.2.0-SNAPSHOT - + org.opendaylight.bgpcep @@ -46,11 +47,19 @@ pom + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + import + pom + + org.opendaylight.controller mdsal-artifacts - ${mdsal.version} + ${controller.mdsal.version} import pom diff --git a/features/bmp/src/main/features/features.xml b/features/bmp/src/main/features/features.xml index 77fcdbedb1..9847e45d33 100644 --- a/features/bmp/src/main/features/features.xml +++ b/features/bmp/src/main/features/features.xml @@ -20,7 +20,7 @@ odl-tcpmd5-netty - odl-mdsal-broker + odl-mdsal-broker odl-bgpcep-bgp-dependencies odl-config-netty mvn:io.netty/netty-codec/${netty.version} diff --git a/features/extras/pom.xml b/features/extras/pom.xml index 7b10c80e66..659fdd264b 100644 --- a/features/extras/pom.xml +++ b/features/extras/pom.xml @@ -26,6 +26,7 @@ 0.8.0-SNAPSHOT 1.3.0-SNAPSHOT 0.4.0-SNAPSHOT + 0.8.0-SNAPSHOT @@ -47,6 +48,8 @@ pom + + org.opendaylight.controller @@ -73,6 +76,14 @@ features xml + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + org.opendaylight.controller features-mdsal @@ -120,4 +131,3 @@ - diff --git a/features/extras/src/main/features/features.xml b/features/extras/src/main/features/features.xml index ab4c91e84e..4019190695 100644 --- a/features/extras/src/main/features/features.xml +++ b/features/extras/src/main/features/features.xml @@ -15,11 +15,12 @@ mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features mvn:com.google.guava/guava/{{VERSION}} - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.bgpcep/concepts/{{VERSION}} mvn:commons-codec/commons-codec/{{VERSION}} @@ -36,4 +37,3 @@ mvn:org.opendaylight.bgpcep/data-change-counter/{{VERSION}} - diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index f8f5349c05..10285d75a0 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -29,6 +29,7 @@ 1.6.0-SNAPSHOT 0.7.0-SNAPSHOT 1.2.0-SNAPSHOT + 0.8.0-SNAPSHOT @@ -97,6 +98,22 @@ features xml + + org.opendaylight.mdsal + features-mdsal + 2.0.0-SNAPSHOT + features + xml + runtime + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + org.opendaylight.controller features-config @@ -247,4 +264,3 @@ - diff --git a/features/pcep/src/main/features/features.xml b/features/pcep/src/main/features/features.xml index dc81be612b..4f3c3b1260 100644 --- a/features/pcep/src/main/features/features.xml +++ b/features/pcep/src/main/features/features.xml @@ -17,6 +17,7 @@ mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features odl-bgpcep-pcep @@ -37,7 +38,7 @@ mvn:com.google.guava/guava/{{VERSION}} - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.bgpcep/concepts/{{VERSION}} mvn:commons-codec/commons-codec/{{VERSION}} @@ -115,4 +116,3 @@ mvn:org.opendaylight.bgpcep/pcep-controller-config/{{VERSION}}/xml/config-segment - diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f1af28c07c..ee0733e10b 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -122,6 +122,13 @@ test + + + org.opendaylight.yangtools.model + yang-ext + test + + org.opendaylight.netconf ietf-netconf-monitoring @@ -151,8 +158,8 @@ test - org.opendaylight.controller - sal-binding-api + org.opendaylight.mdsal + mdsal-binding-api test @@ -253,8 +260,8 @@ test - org.opendaylight.controller - sal-binding-util + org.opendaylight.mdsal + mdsal-binding-util test @@ -268,7 +275,7 @@ test - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding test @@ -361,7 +368,7 @@ junit - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology test diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java index 3e82a29771..d6ab025204 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java @@ -71,7 +71,7 @@ public class AbstractPcepOsgiTest { private Option pcepModules() { return new DefaultCompositeOption( - mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject(), // + mavenBundle("org.opendaylight.mdsal.model", "ietf-topology").versionAsInProject(), // mavenBundle("org.opendaylight.yangtools", "object-cache-api").versionAsInProject(), // mavenBundle("org.opendaylight.bgpcep", "pcep-topology-api").versionAsInProject(), // mavenBundle("org.opendaylight.bgpcep", "pcep-tunnel-api").versionAsInProject(), // diff --git a/parent/pom.xml b/parent/pom.xml index 5ff8b04b41..3443ca235b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -47,6 +47,10 @@ 0.8.0-SNAPSHOT + + 2.0.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.4.0-SNAPSHOT 0.7.0-SNAPSHOT @@ -89,6 +93,22 @@ pom + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + import + pom + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + import + pom + + org.opendaylight.controller @@ -400,7 +420,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml index cbc961d610..88263fccab 100644 --- a/pcep/api/pom.xml +++ b/pcep/api/pom.xml @@ -63,7 +63,7 @@ be here, but the plugin should bring it in. --> - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -81,7 +81,7 @@ discovered by the plugin. --> - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml index 09ed113174..aded22b9c4 100644 --- a/pcep/ietf-stateful07/pom.xml +++ b/pcep/ietf-stateful07/pom.xml @@ -78,11 +78,11 @@ be here, but the plugin should bring it in. --> - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext @@ -100,11 +100,11 @@ discovered by the plugin. --> - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml index 533d65892f..5faaaa38eb 100644 --- a/pcep/impl/pom.xml +++ b/pcep/impl/pom.xml @@ -100,7 +100,7 @@ slf4j-api - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types @@ -108,7 +108,7 @@ yang-common - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml index 53f9de7704..b973f13f67 100644 --- a/pcep/pcc-mock/pom.xml +++ b/pcep/pcc-mock/pom.xml @@ -74,7 +74,7 @@ logback-classic - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/pcep/segment-routing/pom.xml b/pcep/segment-routing/pom.xml index c39a48d609..f078a12a44 100644 --- a/pcep/segment-routing/pom.xml +++ b/pcep/segment-routing/pom.xml @@ -60,7 +60,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -72,11 +72,11 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml index 74a6ae2fa2..2da3558c9c 100644 --- a/pcep/spi/pom.xml +++ b/pcep/spi/pom.xml @@ -54,7 +54,7 @@ config-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/pcep/topology-api/pom.xml b/pcep/topology-api/pom.xml index 293f67799e..cb07187a14 100644 --- a/pcep/topology-api/pom.xml +++ b/pcep/topology-api/pom.xml @@ -53,15 +53,15 @@ programming-topology-api - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml index fc83c867ca..05debcc0ff 100644 --- a/pcep/topology-provider/pom.xml +++ b/pcep/topology-provider/pom.xml @@ -103,15 +103,15 @@ sal-binding-config - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/pcep/tunnel-api/pom.xml b/pcep/tunnel-api/pom.xml index 3e2bba7c86..3fac7df922 100644 --- a/pcep/tunnel-api/pom.xml +++ b/pcep/tunnel-api/pom.xml @@ -61,7 +61,7 @@ topology-tunnel-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -73,7 +73,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml index 29aad781b0..504d59008d 100644 --- a/pcep/tunnel-provider/pom.xml +++ b/pcep/tunnel-provider/pom.xml @@ -98,7 +98,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -110,15 +110,15 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology-l3-unicast-igp diff --git a/programming/api/pom.xml b/programming/api/pom.xml index fbd6d3ba15..d28fea1f1a 100644 --- a/programming/api/pom.xml +++ b/programming/api/pom.xml @@ -33,7 +33,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -45,7 +45,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml index 89bb7f9a6c..23044c7082 100644 --- a/programming/impl/pom.xml +++ b/programming/impl/pom.xml @@ -63,7 +63,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -142,8 +142,8 @@ test - org.opendaylight.yangtools - binding-generator-impl + org.opendaylight.mdsal + mdsal-binding-generator-impl test diff --git a/programming/spi/pom.xml b/programming/spi/pom.xml index 9b41edd58b..5aedb77bfd 100644 --- a/programming/spi/pom.xml +++ b/programming/spi/pom.xml @@ -43,7 +43,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/programming/topology-api/pom.xml b/programming/topology-api/pom.xml index 4f6d520f6c..b8b778e62b 100644 --- a/programming/topology-api/pom.xml +++ b/programming/topology-api/pom.xml @@ -43,7 +43,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -51,7 +51,7 @@ yang-common - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/programming/tunnel-api/pom.xml b/programming/tunnel-api/pom.xml index a011054d27..ff8012d9c1 100644 --- a/programming/tunnel-api/pom.xml +++ b/programming/tunnel-api/pom.xml @@ -41,7 +41,7 @@ topology-tunnel-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -53,7 +53,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/rsvp/api/pom.xml b/rsvp/api/pom.xml index 8790cf3f74..03fad3d291 100644 --- a/rsvp/api/pom.xml +++ b/rsvp/api/pom.xml @@ -38,7 +38,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -51,7 +51,7 @@ - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types diff --git a/topology/api/pom.xml b/topology/api/pom.xml index cb4dd5b338..505f7dfed8 100644 --- a/topology/api/pom.xml +++ b/topology/api/pom.xml @@ -37,7 +37,7 @@ concepts - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -49,11 +49,11 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/topology/segment-routing/pom.xml b/topology/segment-routing/pom.xml index 9010242080..1892aaaa43 100644 --- a/topology/segment-routing/pom.xml +++ b/topology/segment-routing/pom.xml @@ -37,7 +37,7 @@ topology-tunnel-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -49,7 +49,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/topology/tunnel-api/pom.xml b/topology/tunnel-api/pom.xml index 195a93ca09..bfecfe9096 100644 --- a/topology/tunnel-api/pom.xml +++ b/topology/tunnel-api/pom.xml @@ -33,7 +33,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -45,11 +45,11 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-topology diff --git a/util/pom.xml b/util/pom.xml index d478b83bc4..3d1d585f5b 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -54,7 +54,7 @@ concepts - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types -- 2.36.6