From 906c8e38cd67948cdea7933c8b1599fee2856f2d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 21 May 2021 14:14:38 +0200
Subject: [PATCH] Remove restconf-parent

This pom is a useless wrapper around netconf-parent. Eliminate it and
migrate its users.

Change-Id: Id3c0cc6458855a7c4bd9eeb6a2e8e3d47d57b9da
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 restconf/pom.xml                              |  1 -
 restconf/restconf-common-models/pom.xml       |  4 ++--
 restconf/restconf-common/pom.xml              |  4 ++--
 .../ietf-restconf-monitoring/pom.xml          |  4 ++--
 .../restconf-models/ietf-restconf/pom.xml     |  4 ++--
 restconf/restconf-nb-bierman02/pom.xml        |  4 ++--
 restconf/restconf-nb-rfc8040/pom.xml          |  4 ++--
 restconf/restconf-parent/pom.xml              | 20 -------------------
 restconf/sal-rest-docgen-maven/pom.xml        |  4 ++--
 restconf/sal-rest-docgen/pom.xml              |  4 ++--
 restconf/sal-restconf-broker/pom.xml          |  4 ++--
 restconf/websocket-client/pom.xml             |  4 ++--
 12 files changed, 20 insertions(+), 41 deletions(-)
 delete mode 100644 restconf/restconf-parent/pom.xml

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 41cc9c3d7a..5a38c9d5ea 100644
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -28,7 +28,6 @@
     </properties>
 
     <modules>
-        <module>restconf-parent</module>
         <module>restconf-models</module>
         <module>restconf-common-models</module>
         <module>restconf-common</module>
diff --git a/restconf/restconf-common-models/pom.xml b/restconf/restconf-common-models/pom.xml
index e4dc207907..466c27260f 100644
--- a/restconf/restconf-common-models/pom.xml
+++ b/restconf/restconf-common-models/pom.xml
@@ -13,9 +13,9 @@
 
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>restconf-common-models</artifactId>
diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml
index 1fb231aff3..3ae55d464c 100644
--- a/restconf/restconf-common/pom.xml
+++ b/restconf/restconf-common/pom.xml
@@ -13,9 +13,9 @@
 
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>restconf-common</artifactId>
diff --git a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml b/restconf/restconf-models/ietf-restconf-monitoring/pom.xml
index daab5462d1..14942f484e 100644
--- a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml
+++ b/restconf/restconf-models/ietf-restconf-monitoring/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-parent</artifactId>
+        <artifactId>netconf-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../restconf-parent</relativePath>
+        <relativePath>../../../netconf-parent</relativePath>
     </parent>
 
     <artifactId>ietf-restconf-monitoring</artifactId>
diff --git a/restconf/restconf-models/ietf-restconf/pom.xml b/restconf/restconf-models/ietf-restconf/pom.xml
index 7637f4df48..31009ce712 100644
--- a/restconf/restconf-models/ietf-restconf/pom.xml
+++ b/restconf/restconf-models/ietf-restconf/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-parent</artifactId>
+        <artifactId>netconf-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../restconf-parent</relativePath>
+        <relativePath>../../../netconf-parent</relativePath>
     </parent>
 
     <artifactId>ietf-restconf</artifactId>
diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index cbef202f80..18bcd6266a 100644
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>restconf-nb-bierman02</artifactId>
diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 4b3bb718bc..3786206a27 100644
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -12,9 +12,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>restconf-nb-rfc8040</artifactId>
diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml
deleted file mode 100644
index fdf6ae68d0..0000000000
--- a/restconf/restconf-parent/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../../parent</relativePath>
-  </parent>
-
-  <artifactId>restconf-parent</artifactId>
-  <packaging>pom</packaging>
-</project>
diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml
index c2baa1acdb..6f7d8b50c6 100644
--- a/restconf/sal-rest-docgen-maven/pom.xml
+++ b/restconf/sal-rest-docgen-maven/pom.xml
@@ -11,9 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-parent</artifactId>
+        <artifactId>netconf-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../restconf-parent</relativePath>
+        <relativePath>../../netconf-parent</relativePath>
     </parent>
 
     <artifactId>sal-rest-docgen-maven</artifactId>
diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index 5f3f0637ce..45f6f224a4 100644
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>sal-rest-docgen</artifactId>
diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml
index c86f2c82bb..a58545e991 100644
--- a/restconf/sal-restconf-broker/pom.xml
+++ b/restconf/sal-restconf-broker/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
+    <artifactId>netconf-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../restconf-parent</relativePath>
+    <relativePath>../../netconf-parent</relativePath>
   </parent>
 
   <artifactId>sal-restconf-broker</artifactId>
diff --git a/restconf/websocket-client/pom.xml b/restconf/websocket-client/pom.xml
index af0e08797f..459c546c8c 100644
--- a/restconf/websocket-client/pom.xml
+++ b/restconf/websocket-client/pom.xml
@@ -13,9 +13,9 @@
 
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-parent</artifactId>
+        <artifactId>netconf-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../restconf-parent</relativePath>
+        <relativePath>../../netconf-parent</relativePath>
     </parent>
 
     <artifactId>websocket-client</artifactId>
-- 
2.36.6