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 <robert.varga@pantheon.tech>

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index 7b87af3f6f5d030c316333a6c3fb7ae6af094e00..ccedc22e92c9ce20141ee0a3e312938f148d5c75 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml
index fc31ef2810952cdb3d2d359178995cd7727bf29a..04cf7b1d15fba2fdaa301a41d253ffd42906f8d8 100644 (file)
--- a/binding/mdsal-binding-api/pom.xml
+++ b/binding/mdsal-binding-api/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-api</artifactId>

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index ff22e6674d42c0e8b608bcf9b166ddfccfdceeb4..2b52df5b8b05ddb15c1d710c8570c8495728c7f4 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-dom-adapter</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-api/pom.xml b/binding/mdsal-binding-dom-codec-api/pom.xml
index c63dff8044621671246b01c6b5ea3507d89e70c0..22b701a1fa5b19aba46c2d970583c33638660b27 100644 (file)
--- a/binding/mdsal-binding-dom-codec-api/pom.xml
+++ b/binding/mdsal-binding-dom-codec-api/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-dom-codec-api</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index 968d139d1e05d25baf54700f35bebaccd3d950e2..120ec4d4fafc37ef28f140925fc033a6957118f0 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-dom-codec-osgi</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml
index 866764e0c0bcc4ba981784732c011192e2bf00db..0793234580111a45ead066da3fd49ad60486e49b 100644 (file)
--- a/binding/mdsal-binding-dom-codec-spi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-spi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-dom-codec-spi</artifactId>

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index 34f274b3fd18c34d6495339d12571fac08b7076c..08fa6dfd0348263b8e7afb92b9ad6045fabf2b2b 100644 (file)
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-dom-codec</artifactId>

diff --git a/binding/mdsal-binding-generator/pom.xml b/binding/mdsal-binding-generator/pom.xml
index a44f167917b66731b12737154374e53c22a0fb2b..6d5487a3344fe1bd8f48869b9680b4fff17263c2 100644 (file)
--- a/binding/mdsal-binding-generator/pom.xml
+++ b/binding/mdsal-binding-generator/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-generator</artifactId>

diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml
index ea8f87736ee1547da3b3eb0a6d5ab09d601b73bb..30b097bc8dd5c87a39d00a01a1603379da1a1178 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/pom.xml
+++ b/binding/mdsal-binding-java-api-generator/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-java-api-generator</artifactId>

diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml
index 38f65ba9d1d633ba5aef44b3506ff86ee838f5ae..e1b8efe996f22950c9501760ad24a77a22718793 100644 (file)
--- a/binding/mdsal-binding-loader/pom.xml
+++ b/binding/mdsal-binding-loader/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-loader</artifactId>

diff --git a/binding/mdsal-binding-model-api/pom.xml b/binding/mdsal-binding-model-api/pom.xml
index 16b7a4491a737daddba44b1d8dc4d93f368f6f33..d6aa8a9acff2609b33004c0c3fc01645c2a15a2c 100644 (file)
--- a/binding/mdsal-binding-model-api/pom.xml
+++ b/binding/mdsal-binding-model-api/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-model-api</artifactId>

diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml
index 55098b28f9dd91243a2e5bdfc3a8a65f27e606b0..2ddb56038229c5f9a1b8c3794706dc1a18b961b3 100644 (file)
--- a/binding/mdsal-binding-model-ri/pom.xml
+++ b/binding/mdsal-binding-model-ri/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-model-ri</artifactId>

diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml
index 87261eaeaa17addc5b4f7cfab5c495b99dc2c2ea..9c38f3a408b039a3f94181c745ae050279c9d665 100644 (file)
--- a/binding/mdsal-binding-runtime-api/pom.xml
+++ b/binding/mdsal-binding-runtime-api/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-runtime-api</artifactId>

diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml
index 329d0c4cfd9c5aaddc9f4906436c2077d67092b8..6c0d0aa04a68119d84c8b6d38b7856d63ec6f6be 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/binding/mdsal-binding-runtime-osgi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-runtime-osgi</artifactId>

diff --git a/binding/mdsal-binding-runtime-spi/pom.xml b/binding/mdsal-binding-runtime-spi/pom.xml
index a0ad3891819db4efa503ddcc4c19700d5888fa23..462e56bc72c3590488e80830768432b8030e2fea 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/pom.xml
+++ b/binding/mdsal-binding-runtime-spi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-runtime-spi</artifactId>

diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml
index a100ac1d40dd4ac87b570cbe67c1c9d12ef55723..a2eb5d2b9c4bd3f416f85906dc30a992c4e4915a 100644 (file)
--- a/binding/mdsal-binding-spec-util/pom.xml
+++ b/binding/mdsal-binding-spec-util/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-spec-util</artifactId>

diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml
index 77298c719534eb3c678e6c2bb9bb76d0452c1ebd..114e1bf3960a71817af4059870e2811d7fef4b7c 100644 (file)
--- a/binding/mdsal-binding-spi/pom.xml
+++ b/binding/mdsal-binding-spi/pom.xml
@@ -12,9 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-spi</artifactId>

diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml
index 6f62e4e93afb3f610fe3d758052a9c626c52af65..ab0e4a25a487260397406d0dabb4dc49a8d321a2 100644 (file)
--- a/binding/mdsal-binding-util/pom.xml
+++ b/binding/mdsal-binding-util/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-binding-util</artifactId>

diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml
index 8f1470d6a16c4898666bfbd6a1df4a37a3044e2e..2bc895e43e5e5edda5265a39dbeb37e730617ab8 100644 (file)
--- a/binding/yang-binding/pom.xml
+++ b/binding/yang-binding/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>yang-binding</artifactId>

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 7aaaa62de666d0c52f9250791e27b2bcb35225f3..6af795f2cc31e3e07a51e3aca929d2c3b5097d3c 100644 (file)
--- a/dom/dom-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -10,29 +10,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>dom-parent</artifactId>
+    <artifactId>bundle-parent</artifactId>
     <version>13.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-
-    <description>pom.xml for MD-SAL DOM plugins</description>
+    <name>${project.artifactId}</name>
+    <description>Bundle parent (felix-based)</description>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>13.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -47,4 +40,11 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/display/ODL/MD-SAL</url>
+    </scm>
 </project>

diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml
index ac83ce4fe9c2fd12012326e6d4d08a20ac576e1d..116acdda8c629fea2b917da65abada4b49aae281 100644 (file)
--- a/common/mdsal-common-api/pom.xml
+++ b/common/mdsal-common-api/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-common-api</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
index 1dbb8ae3884334c5a5cf588037f2e3f18e34162a..043b45753dd63f3a34f0e9b78746ae78bc6bb25c 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom/dom-parent</relativePath>
+        <relativePath>../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-docs</artifactId>

diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml
index d19e55936886cd5d92c206a32c179639fdffa867..d35b158bddafa0e780b4908b7361342c70cd8b64 100644 (file)
--- a/dom/mdsal-dom-api/pom.xml
+++ b/dom/mdsal-dom-api/pom.xml
@@ -12,9 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-api</artifactId>

diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml
index 1ccdb90429ad2af13e108d95572fe9eb05a10f88..e051da7a064e7de706ab50bde96ad63d17d4139f 100644 (file)
--- a/dom/mdsal-dom-broker/pom.xml
+++ b/dom/mdsal-dom-broker/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-broker</artifactId>

diff --git a/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml b/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml
index f541c603d7c48c9ba8c7dd133f11a4d78843732b..c74b4bc428f4113d19e2090d357459b69055833e 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore-benchmark/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-inmemory-datastore-benchmark</artifactId>

diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index d1ab47ea7cd850935b9c0f9338b3e88ae9664e11..28d8ded347ecb830d26453e38519e17bb7b022d6 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -12,9 +12,9 @@
    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-inmemory-datastore</artifactId>

diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index af320a17b2c9f89e580c656d40351ff5a071744e..3096b8521931175570acab97453a2697f1564e84 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-schema-osgi</artifactId>

diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml
index 7868dae4eabeb4b0ddc5fddcf028f006fa92610e..84f9f584ae524053ee56492b157808a4b0591314 100644 (file)
--- a/dom/mdsal-dom-spi/pom.xml
+++ b/dom/mdsal-dom-spi/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-dom-spi</artifactId>

diff --git a/dom/pom.xml b/dom/pom.xml
index 7ef69501f8ab1331c4c5deb6c1ca73f41dc21e69..52f224b1edfe70e9b1ecb7a16044fc400cb64cb0 100644 (file)
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -29,7 +29,6 @@
     </properties>
 
     <modules>
-        <module>dom-parent</module>
         <module>mdsal-dom-api</module>
         <module>mdsal-dom-spi</module>
         <module>mdsal-dom-broker</module>

diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml
index 201819de1f03569225fbdb90c1f92d559557c85e..b53760e3711fe7f6fada24790c30e2bf492c2240 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/pom.xml
+++ b/entityownership/mdsal-eos-binding-adapter/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-eos-binding-adapter</artifactId>

diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml
index 4791fd6cedb3c22f96a2d5f3bc908b9580dd51ee..2d12e737607f0f5fb978c2ac99485b22207f10da 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/pom.xml
+++ b/entityownership/mdsal-eos-binding-api/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-eos-binding-api</artifactId>

diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml
index b8852230b76e9aed3dfb72438d6ad7c9eba06774..fef4a72212af985bcf6b75c7364ac0f5ef45dc2f 100644 (file)
--- a/entityownership/mdsal-eos-common-api/pom.xml
+++ b/entityownership/mdsal-eos-common-api/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-eos-common-api</artifactId>

diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml
index c01d28ab1299617b8e5e0244811761c6ab403f9e..9418eedc764502d4e99fe7f9769224fc0edb83d9 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/pom.xml
+++ b/entityownership/mdsal-eos-dom-api/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-eos-dom-api</artifactId>

diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml
index df5c72db8ef436bccbe3593e8b640df6e44ebcb4..430858df41bbc7a5bd4c3674a2c51408de74ca04 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/pom.xml
+++ b/entityownership/mdsal-eos-dom-simple/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-eos-dom-simple</artifactId>

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 8b791a0288f0e2f25a33bcf37054e09763d5a4cd..e957381b0a486bb8e75dafff960ddbc5eafeae86 100644 (file)
--- a/features/feature-parent/pom.xml
+++ b/features/feature-parent/pom.xml
@@ -33,7 +33,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>dom-parent</artifactId>
+                <artifactId>bundle-parent</artifactId>
                 <version>13.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/netty/mdsal-rfc8294-netty/pom.xml b/netty/mdsal-rfc8294-netty/pom.xml
index 8e74d8def5a0acef273ed8aefe997d5d7ff73772..0ad922c94e826366b767edccbdc1b3fec68441b2 100644 (file)
--- a/netty/mdsal-rfc8294-netty/pom.xml
+++ b/netty/mdsal-rfc8294-netty/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-rfc8294-netty</artifactId>

diff --git a/pom.xml b/pom.xml
index 8ac6c411452e65bd43cb899a4da8f14ae81e2e44..08903743990e07022e3ad336f2478f1e2267ac11 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
 
     <modules>
         <module>artifacts</module>
+        <module>bundle-parent</module>
         <module>common</module>
         <module>docs</module>
         <module>features</module>

diff --git a/replicate/mdsal-replicate-common/pom.xml b/replicate/mdsal-replicate-common/pom.xml
index b596fa5fe5dc6fe8b2044c21a963ea3603cbf0d3..d9b52207a3f1dd1a34d6a16ee57b39431235ed79 100644 (file)
--- a/replicate/mdsal-replicate-common/pom.xml
+++ b/replicate/mdsal-replicate-common/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-replicate-common</artifactId>

diff --git a/replicate/mdsal-replicate-netty/pom.xml b/replicate/mdsal-replicate-netty/pom.xml
index 26aca23ac951de23fd8b3b6fbbf4d4278b6a8f07..5959535ef728353a794ace309076c61a677a9b05 100644 (file)
--- a/replicate/mdsal-replicate-netty/pom.xml
+++ b/replicate/mdsal-replicate-netty/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-replicate-netty</artifactId>

diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml
index ec7c0a4b0396c0081571b90419ef6136a13f27b5..cd6036e945992ea9650a83b66ce2049d87c7ddeb 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/pom.xml
+++ b/singleton-service/mdsal-singleton-common-api/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-singleton-common-api</artifactId>

diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml
index 6243baf805c34e685e02121efccac725e0b5b952..d12503ed0200522830195604b6a7700b21c3bbb3 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/pom.xml
+++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-singleton-dom-impl</artifactId>

diff --git a/trace/mdsal-trace-cli/pom.xml b/trace/mdsal-trace-cli/pom.xml
index d34f4083bd2bdcaf9b6a5d85e02e335ba232be29..d02b719b2383a9a6dfe22901f1ab150da4c90efd 100644 (file)
--- 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
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-trace-cli</artifactId>

diff --git a/trace/mdsal-trace-impl/pom.xml b/trace/mdsal-trace-impl/pom.xml
index 591b97a394fe41b92e382c41b1022eaffa68a437..9f5b603f052e3212752ff25d80610091664eb190 100644 (file)
--- a/trace/mdsal-trace-impl/pom.xml
+++ b/trace/mdsal-trace-impl/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-trace-impl</artifactId>

diff --git a/yanglib/mdsal-yanglib-api/pom.xml b/yanglib/mdsal-yanglib-api/pom.xml
index 8e49288941cf1dadb00ef5a9d5caa94d3838af60..46c2ec1c0bcfad2c45b8aeb5083f756432d6fe09 100644 (file)
--- a/yanglib/mdsal-yanglib-api/pom.xml
+++ b/yanglib/mdsal-yanglib-api/pom.xml
@@ -12,9 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-yanglib-api</artifactId>

diff --git a/yanglib/mdsal-yanglib-rfc8525/pom.xml b/yanglib/mdsal-yanglib-rfc8525/pom.xml
index 747ecdbdfc52fea084a81740db8f4ef8d64692ed..5660fc90407e4e48d70190916b23c9efbacec206 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc8525/pom.xml
+++ b/yanglib/mdsal-yanglib-rfc8525/pom.xml
@@ -12,9 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
+        <artifactId>bundle-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../dom/dom-parent</relativePath>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-yanglib-rfc8525</artifactId>