From: Robert Varga Date: Sat, 13 Jan 2024 17:01:39 +0000 (+0100) Subject: Promote dom-parent to bundle-parent X-Git-Tag: v13.0.0~34 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=13b5d9f8f776d671eb40b51d71fc1b79253877ab Promote dom-parent to bundle-parent This parent is used all over place. It really is MD-SAL's 'bundle-parent', so let's promote and rename it. While we are at it, also switch its parent to yangtools' bundle-parent and define correct SCM. Change-Id: Idf72a16eb6ceb1c2816d79d28470efd7665b02ce Signed-off-by: Robert Varga --- diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml index 7b87af3f6f..ccedc22e92 100644 --- a/binding/binding-parent/pom.xml +++ b/binding/binding-parent/pom.xml @@ -11,9 +11,9 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent 4.0.0 diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml index fc31ef2810..04cf7b1d15 100644 --- a/binding/mdsal-binding-api/pom.xml +++ b/binding/mdsal-binding-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-api diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml index ff22e6674d..2b52df5b8b 100644 --- a/binding/mdsal-binding-dom-adapter/pom.xml +++ b/binding/mdsal-binding-dom-adapter/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-dom-adapter diff --git a/binding/mdsal-binding-dom-codec-api/pom.xml b/binding/mdsal-binding-dom-codec-api/pom.xml index c63dff8044..22b701a1fa 100644 --- a/binding/mdsal-binding-dom-codec-api/pom.xml +++ b/binding/mdsal-binding-dom-codec-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-dom-codec-api diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml index 968d139d1e..120ec4d4fa 100644 --- a/binding/mdsal-binding-dom-codec-osgi/pom.xml +++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-dom-codec-osgi diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml index 866764e0c0..0793234580 100644 --- a/binding/mdsal-binding-dom-codec-spi/pom.xml +++ b/binding/mdsal-binding-dom-codec-spi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-dom-codec-spi diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml index 34f274b3fd..08fa6dfd03 100644 --- a/binding/mdsal-binding-dom-codec/pom.xml +++ b/binding/mdsal-binding-dom-codec/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-dom-codec diff --git a/binding/mdsal-binding-generator/pom.xml b/binding/mdsal-binding-generator/pom.xml index a44f167917..6d5487a334 100644 --- a/binding/mdsal-binding-generator/pom.xml +++ b/binding/mdsal-binding-generator/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-generator diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml index ea8f87736e..30b097bc8d 100644 --- a/binding/mdsal-binding-java-api-generator/pom.xml +++ b/binding/mdsal-binding-java-api-generator/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-java-api-generator diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml index 38f65ba9d1..e1b8efe996 100644 --- a/binding/mdsal-binding-loader/pom.xml +++ b/binding/mdsal-binding-loader/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-loader diff --git a/binding/mdsal-binding-model-api/pom.xml b/binding/mdsal-binding-model-api/pom.xml index 16b7a4491a..d6aa8a9acf 100644 --- a/binding/mdsal-binding-model-api/pom.xml +++ b/binding/mdsal-binding-model-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-model-api diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml index 55098b28f9..2ddb560382 100644 --- a/binding/mdsal-binding-model-ri/pom.xml +++ b/binding/mdsal-binding-model-ri/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-model-ri diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml index 87261eaeaa..9c38f3a408 100644 --- a/binding/mdsal-binding-runtime-api/pom.xml +++ b/binding/mdsal-binding-runtime-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-runtime-api diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml index 329d0c4cfd..6c0d0aa04a 100644 --- a/binding/mdsal-binding-runtime-osgi/pom.xml +++ b/binding/mdsal-binding-runtime-osgi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-runtime-osgi diff --git a/binding/mdsal-binding-runtime-spi/pom.xml b/binding/mdsal-binding-runtime-spi/pom.xml index a0ad389181..462e56bc72 100644 --- a/binding/mdsal-binding-runtime-spi/pom.xml +++ b/binding/mdsal-binding-runtime-spi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-runtime-spi diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml index a100ac1d40..a2eb5d2b9c 100644 --- a/binding/mdsal-binding-spec-util/pom.xml +++ b/binding/mdsal-binding-spec-util/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-spec-util diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml index 77298c7195..114e1bf396 100644 --- a/binding/mdsal-binding-spi/pom.xml +++ b/binding/mdsal-binding-spi/pom.xml @@ -12,9 +12,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-spi diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml index 6f62e4e93a..ab0e4a25a4 100644 --- a/binding/mdsal-binding-util/pom.xml +++ b/binding/mdsal-binding-util/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-binding-util diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml index 8f1470d6a1..2bc895e43e 100644 --- a/binding/yang-binding/pom.xml +++ b/binding/yang-binding/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent yang-binding diff --git a/dom/dom-parent/pom.xml b/bundle-parent/pom.xml similarity index 73% rename from dom/dom-parent/pom.xml rename to bundle-parent/pom.xml index 7aaaa62de6..6af795f2cc 100644 --- a/dom/dom-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -10,29 +10,22 @@ - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 13.0.10 + 13.0.0 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT pom - - pom.xml for MD-SAL DOM plugins + ${project.artifactId} + Bundle parent (felix-based) - - org.opendaylight.yangtools - yangtools-artifacts - 13.0.0 - pom - import - org.opendaylight.mdsal mdsal-artifacts @@ -47,4 +40,11 @@ + + + scm:git:ssh://git.opendaylight.org:29418/mdsal.git + scm:git:ssh://git.opendaylight.org:29418/mdsal.git + HEAD + https://wiki.opendaylight.org/display/ODL/MD-SAL + diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml index ac83ce4fe9..116acdda8c 100644 --- a/common/mdsal-common-api/pom.xml +++ b/common/mdsal-common-api/pom.xml @@ -12,9 +12,9 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-common-api diff --git a/docs/pom.xml b/docs/pom.xml index 1dbb8ae388..043b45753d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom/dom-parent + ../bundle-parent mdsal-docs diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml index d19e559368..d35b158bdd 100644 --- a/dom/mdsal-dom-api/pom.xml +++ b/dom/mdsal-dom-api/pom.xml @@ -12,9 +12,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-api diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml index 1ccdb90429..e051da7a06 100644 --- a/dom/mdsal-dom-broker/pom.xml +++ b/dom/mdsal-dom-broker/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-broker diff --git a/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml b/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml index f541c603d7..c74b4bc428 100644 --- a/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-inmemory-datastore-benchmark diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml index d1ab47ea7c..28d8ded347 100644 --- a/dom/mdsal-dom-inmemory-datastore/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore/pom.xml @@ -12,9 +12,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-inmemory-datastore diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml index af320a17b2..3096b85219 100644 --- a/dom/mdsal-dom-schema-osgi/pom.xml +++ b/dom/mdsal-dom-schema-osgi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-schema-osgi diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml index 7868dae4ea..84f9f584ae 100644 --- a/dom/mdsal-dom-spi/pom.xml +++ b/dom/mdsal-dom-spi/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../dom-parent + ../../bundle-parent mdsal-dom-spi diff --git a/dom/pom.xml b/dom/pom.xml index 7ef69501f8..52f224b1ed 100644 --- a/dom/pom.xml +++ b/dom/pom.xml @@ -29,7 +29,6 @@ - dom-parent mdsal-dom-api mdsal-dom-spi mdsal-dom-broker diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml index 201819de1f..b53760e371 100644 --- a/entityownership/mdsal-eos-binding-adapter/pom.xml +++ b/entityownership/mdsal-eos-binding-adapter/pom.xml @@ -10,9 +10,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-eos-binding-adapter diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml index 4791fd6ced..2d12e73760 100644 --- a/entityownership/mdsal-eos-binding-api/pom.xml +++ b/entityownership/mdsal-eos-binding-api/pom.xml @@ -10,9 +10,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-eos-binding-api diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml index b8852230b7..fef4a72212 100644 --- a/entityownership/mdsal-eos-common-api/pom.xml +++ b/entityownership/mdsal-eos-common-api/pom.xml @@ -10,9 +10,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-eos-common-api diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml index c01d28ab12..9418eedc76 100644 --- a/entityownership/mdsal-eos-dom-api/pom.xml +++ b/entityownership/mdsal-eos-dom-api/pom.xml @@ -10,9 +10,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-eos-dom-api diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml index df5c72db8e..430858df41 100644 --- a/entityownership/mdsal-eos-dom-simple/pom.xml +++ b/entityownership/mdsal-eos-dom-simple/pom.xml @@ -10,9 +10,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-eos-dom-simple diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml index 8b791a0288..e957381b0a 100644 --- a/features/feature-parent/pom.xml +++ b/features/feature-parent/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT pom import diff --git a/netty/mdsal-rfc8294-netty/pom.xml b/netty/mdsal-rfc8294-netty/pom.xml index 8e74d8def5..0ad922c94e 100644 --- a/netty/mdsal-rfc8294-netty/pom.xml +++ b/netty/mdsal-rfc8294-netty/pom.xml @@ -12,9 +12,9 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-rfc8294-netty diff --git a/pom.xml b/pom.xml index 8ac6c41145..0890374399 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ artifacts + bundle-parent common docs features diff --git a/replicate/mdsal-replicate-common/pom.xml b/replicate/mdsal-replicate-common/pom.xml index b596fa5fe5..d9b52207a3 100644 --- a/replicate/mdsal-replicate-common/pom.xml +++ b/replicate/mdsal-replicate-common/pom.xml @@ -11,9 +11,9 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-replicate-common diff --git a/replicate/mdsal-replicate-netty/pom.xml b/replicate/mdsal-replicate-netty/pom.xml index 26aca23ac9..5959535ef7 100644 --- a/replicate/mdsal-replicate-netty/pom.xml +++ b/replicate/mdsal-replicate-netty/pom.xml @@ -11,9 +11,9 @@ org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-replicate-netty diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml index ec7c0a4b03..cd6036e945 100644 --- a/singleton-service/mdsal-singleton-common-api/pom.xml +++ b/singleton-service/mdsal-singleton-common-api/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-singleton-common-api diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml index 6243baf805..d12503ed02 100644 --- a/singleton-service/mdsal-singleton-dom-impl/pom.xml +++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-singleton-dom-impl diff --git a/trace/mdsal-trace-cli/pom.xml b/trace/mdsal-trace-cli/pom.xml index d34f4083bd..d02b719b23 100644 --- a/trace/mdsal-trace-cli/pom.xml +++ b/trace/mdsal-trace-cli/pom.xml @@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-trace-cli diff --git a/trace/mdsal-trace-impl/pom.xml b/trace/mdsal-trace-impl/pom.xml index 591b97a394..9f5b603f05 100644 --- a/trace/mdsal-trace-impl/pom.xml +++ b/trace/mdsal-trace-impl/pom.xml @@ -11,9 +11,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-trace-impl diff --git a/yanglib/mdsal-yanglib-api/pom.xml b/yanglib/mdsal-yanglib-api/pom.xml index 8e49288941..46c2ec1c0b 100644 --- a/yanglib/mdsal-yanglib-api/pom.xml +++ b/yanglib/mdsal-yanglib-api/pom.xml @@ -12,9 +12,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-yanglib-api diff --git a/yanglib/mdsal-yanglib-rfc8525/pom.xml b/yanglib/mdsal-yanglib-rfc8525/pom.xml index 747ecdbdfc..5660fc9040 100644 --- a/yanglib/mdsal-yanglib-rfc8525/pom.xml +++ b/yanglib/mdsal-yanglib-rfc8525/pom.xml @@ -12,9 +12,9 @@ 4.0.0 org.opendaylight.mdsal - dom-parent + bundle-parent 13.0.0-SNAPSHOT - ../../dom/dom-parent + ../../bundle-parent mdsal-yanglib-rfc8525