Move netconf-parent

This parent is a dead ringer for restconf-parent, promote it to
project-wide parent and inherit dependencies from restconf-parent,
hence we lose duplicate definitions of upstream dependencies.

Change-Id: If2e994a6a76f1826e2976855f9e9624597628ca8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index dbb38b27b0377c9141f8294d75672177570cb895..8f0ec7fdd93c9cbff6d26ac4abf322eb6fe666a1 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/netconf/aaa-authn-odl-plugin/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/callhome-model/pom.xml b/netconf/callhome-model/pom.xml
index d56de714ac4ac6daa4766067fa6462a29822e355..c46b4b18eb21214aa9451930a9594f8d995307da 100644 (file)
--- a/netconf/callhome-model/pom.xml
+++ b/netconf/callhome-model/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/callhome-protocol/pom.xml b/netconf/callhome-protocol/pom.xml
index 98299e073fa39c0c70218e0a40c42cc4814c90e1..4d52ba9fd64d2308b47ab683064649995b66e666 100644 (file)
--- a/netconf/callhome-protocol/pom.xml
+++ b/netconf/callhome-protocol/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/callhome-provider/pom.xml b/netconf/callhome-provider/pom.xml
index 20da7ba3538f57c1a46f8df35e7a170be0e1785d..567e9b95ece22e301cf50abe57cf0d91b573c953 100644 (file)
--- a/netconf/callhome-provider/pom.xml
+++ b/netconf/callhome-provider/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index fabdd3f553e819f8220e938bb47689e878ab85e5..0179e531214882c1986ef8939f8be94a93cd8d40 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml
index 9cf719df9136d031a47bbe18b7d24fe6d13a984b..4784dfd83e1add75dac28919cd6a00cacf5bb85e 100644 (file)
--- a/netconf/mdsal-netconf-impl/pom.xml
+++ b/netconf/mdsal-netconf-impl/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 79de476a0a9790fcea2cf16fe6bb1c8d3fcbeddd..9fe76ca6b8340931345d3579aca0aeb85b81a5f0 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index 4153a7d0d67f1db2221feb6e0fcecce395ce60da..17fe14be66a73670523981cda44838d5249b0d54 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -12,7 +12,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>mdsal-netconf-notification</artifactId>

diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml
index 259b2d9b942cc1e02e995399a29af1157816e818..f1895fb2f01c0cf7aa7b82691b1ac88815bc5381 100644 (file)
--- a/netconf/mdsal-netconf-ssh/pom.xml
+++ b/netconf/mdsal-netconf-ssh/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <artifactId>mdsal-netconf-ssh</artifactId>

diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml
index c656657788c33dfcecba3911625296c1654da20d..8e618e6bddee7a180d2d15e691c4296860a1358c 100644 (file)
--- a/netconf/mdsal-netconf-tcp/pom.xml
+++ b/netconf/mdsal-netconf-tcp/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <artifactId>mdsal-netconf-tcp</artifactId>

diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml
index 6495d0e2760bb7f924419d40ce73c52fdb9cf922..71ef074522e8f45f7233059093f0a017cbc5bbbc 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/pom.xml
+++ b/netconf/mdsal-netconf-yang-library/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index b527aa938b48d72439a42e9da92e17c2a5dd5647..8b54ae1423c06a67951c3ae056ce23761a416c87 100644 (file)
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
index 78943004ed02ed91c8bab6e3b64947e5efcae6b3..d55013a2d1b1b52def5447e648e44468aae99b19 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../../netconf-parent</relativePath>
+    <relativePath>../../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/netconf/models/ietf-netconf-monitoring/pom.xml
index a5bfb57af7c8d32f00cb57de2eb9f407afbe27cb..880a77883b57aa281dbb26c327a985f43dbbabda 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../../netconf-parent</relativePath>
+    <relativePath>../../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf-nmda/pom.xml b/netconf/models/ietf-netconf-nmda/pom.xml
index a021508155704f0c9eeab0bef1e7bd85ae099429..5da4ad7d89572f5ce690149999ae8b6d0ff17205 100644 (file)
--- a/netconf/models/ietf-netconf-nmda/pom.xml
+++ b/netconf/models/ietf-netconf-nmda/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../../netconf-parent</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/netconf/models/ietf-netconf-notifications/pom.xml
index fd0bfaeadd3c845bbd33e48ea6bd680531fee946..baee90306610d1e8d951db3e20e6ec4cc36687a7 100644 (file)
--- a/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/netconf/models/ietf-netconf-notifications/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../../netconf-parent</relativePath>
+    <relativePath>../../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf-with-defaults/pom.xml b/netconf/models/ietf-netconf-with-defaults/pom.xml
index be6827f649a8d62b3dcbb790d6983b7354dcc633..bbf57db1c35053b37c5337a321e00f33f6824a3f 100644 (file)
--- a/netconf/models/ietf-netconf-with-defaults/pom.xml
+++ b/netconf/models/ietf-netconf-with-defaults/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../../netconf-parent</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/ietf-netconf/pom.xml b/netconf/models/ietf-netconf/pom.xml
index 28b95d8779f0905e54e77cdbbac39d21aa47009d..76ca5cb8a4d63978f9fef5dcabd7dbe6384368fd 100644 (file)
--- a/netconf/models/ietf-netconf/pom.xml
+++ b/netconf/models/ietf-netconf/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../../netconf-parent</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index b6117c4b233405cd1bc172b34a81640eb3a48a6b..2690f0d9fdf4cf5fd379544b66d409fa01662b92 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml
index b505a8b8367662d3bcb88cfc57c4189b26a6f212..b28acff4a6a2763ea1215d97c1de8164e9a4b4eb 100644 (file)
--- a/netconf/netconf-auth/pom.xml
+++ b/netconf/netconf-auth/pom.xml
@@ -12,7 +12,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml
index 5044cb2fc3dbd2f0d529787d7198f45b0b5f882a..1408e540b19760ab47ff0f48d50dc7da41498a95 100644 (file)
--- a/netconf/netconf-client/pom.xml
+++ b/netconf/netconf-client/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index a0760da253849c367cf676e35ae8bdf8711cb1b3..784f322d78dfb285bc3469e0fcce933261266303 100644 (file)
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index eb93e6b9a8bfde088ad9f7cc1efb154e1ab631e5..771be0670e0e5a7d857a83e3bb339711a71faeed 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml
index 7d5f4b7d53f6006e50a99ccf0da2cd1b7cfc1c20..5caceae4c1f2b2f94e3fa11a15093c7b7b222a30 100644 (file)
--- a/netconf/netconf-mapping-api/pom.xml
+++ b/netconf/netconf-mapping-api/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index a596ecb34037c07cdbc3d3af9831d1e8401ec04d..8fff64f5c693bac664e6f47a195be5c1b5d15fe5 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index 310688a8614c1fd80cb7cfb6a1c227dc1f8df181..fae294585abe54494f2dfed40b583424f0813e17 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -16,7 +16,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index be7f4f5e31c21f59404af6de5f9516f526041130..7898c3fcae57725392c140a9b3e4c6797820abf9 100644 (file)
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index 16ddb787fabbf89f811303888232e48485db2bc7..4784a31100fd218f24e2a6379699991eb5690456 100644 (file)
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 4a9767677768b2b4a5477409ae8717b5e1963788..e410049598fe9cac98cd81d797351007597e00e1 100644 (file)
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 9612a73d38df3c378e34311d6ee757b658f1b9d5..af02c5d4495bd5b884da8ce7ed0a0ae11cf6686d 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -39,7 +39,6 @@
     <module>mdsal-netconf-notification</module>
     <module>mdsal-netconf-yang-library</module>
     <module>mdsal-netconf-impl</module>
-    <module>netconf-parent</module>
     <module>netconf-util</module>
     <module>netconf-netty-util</module>
     <module>netconf-mapping-api</module>

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 6a6e42fc1c2d5acaff86e3c53a750707546e0782..85e0968b995175750d924780ccf249847876765a 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../netconf-parent</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 2729a19491a360452565c8e7fce2596b85534ff1..730b41e8e8e20b0a7305e7d5e2da1921a1cc6be7 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../../netconf-parent</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml
index 74484ad8842890420e73e317c263fbfc090d91a1..7fa65218e66a4874612fda0abba8b3a48ba651f0 100644 (file)
--- a/netconf/yanglib/pom.xml
+++ b/netconf/yanglib/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
-        <relativePath>../netconf-parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/netconf-parent/pom.xml b/parent/pom.xml
similarity index 82%
rename from netconf/netconf-parent/pom.xml
rename to parent/pom.xml
index 1d0a25c1721d4f162b6d621a8adf4f7c384c3936..5ee3c4b5324481004b3610a17ee27e3ff089427d 100644 (file)
--- a/netconf/netconf-parent/pom.xml
+++ b/parent/pom.xml
@@ -29,6 +29,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
@@ -36,6 +43,14 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.infrautils</groupId>
+        <artifactId>infrautils-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>

diff --git a/pom.xml b/pom.xml
index b5ef338decd249cb363fabfae6073f68f373f17c..57c3a9ca94623f9543ea3fd697d43c8c08619977 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
 
     <modules>
         <module>artifacts</module>
+        <module>parent</module>
         <module>features</module>
         <module>karaf</module>
         <module>netconf</module>

diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml
index 6cdfe3a542d56b6c373156e24602fb0ba87aa60d..b85100b614294190ffb186cfb6a6012c63bd6171 100644 (file)
--- a/restconf/restconf-parent/pom.xml
+++ b/restconf/restconf-parent/pom.xml
@@ -9,73 +9,14 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>4.0.4</version>
-    <relativePath/>
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>netconf-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>restconf-parent</artifactId>
   <version>1.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.infrautils</groupId>
-        <artifactId>infrautils-artifacts</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-artifacts</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.11.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-maven-plugin</artifactId>
-        <configuration>
-          <failOnError>true</failOnError>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>