Code Review / netconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 6e21e51)
Remove restconf-parent 98/96298/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 21 May 2021 12:14:38 +0000 (14:14 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 21 May 2021 12:14:38 +0000 (14:14 +0200)
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>
12 files changed:
restconf/pom.xml patch | blob | history
restconf/restconf-common-models/pom.xml patch | blob | history
restconf/restconf-common/pom.xml patch | blob | history
restconf/restconf-models/ietf-restconf-monitoring/pom.xml patch | blob | history
restconf/restconf-models/ietf-restconf/pom.xml patch | blob | history
restconf/restconf-nb-bierman02/pom.xml patch | blob | history
restconf/restconf-nb-rfc8040/pom.xml patch | blob | history
restconf/restconf-parent/pom.xml [deleted file] patch | blob | history
restconf/sal-rest-docgen-maven/pom.xml patch | blob | history
restconf/sal-rest-docgen/pom.xml patch | blob | history
restconf/sal-restconf-broker/pom.xml patch | blob | history
restconf/websocket-client/pom.xml patch | blob | history

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 41cc9c3d7a8614eb8cc1bc8307cb18517ad5b7a6..5a38c9d5eaaeb75df6413742be19149b033a4100 100644 (file)
--- 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 e4dc207907709d25a94017abb53f0ec3db50f86f..466c27260f0e55b3a0b948d3745eeff3e4cefe9f 100644 (file)
--- 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 1fb231aff3c808872ae3ddbd1fb3bfdc54a6ff95..3ae55d464c59dca6aa017aa6fa3593f52e63a28c 100644 (file)
--- 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 daab5462d1ea5cdcd17eedf06f043933762d218f..14942f484e92f987cd0a983a85d0de83bc9fcc10 100644 (file)
--- 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 7637f4df487d6610468b2eaefc419cc579667a6e..31009ce712a4e8ab3d92bddc3e18552361eb007d 100644 (file)
--- 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 cbef202f80437851776aa44a320d4521d8488fc9..18bcd6266aaabd607347cc47cdc5df35fc45a716 100644 (file)
--- 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 4b3bb718bc8b7c87f64e4675e47340d10aa74360..3786206a27b6eabbed37e3b8c53119e3e46ba754 100644 (file)
--- 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 (file)
index fdf6ae6..0000000
--- 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 c2baa1acdb5cb208e9a3ae6f0d9320a7b6f7b930..6f7d8b50c690673de7045b7e5dd63f24bd3d60d2 100644 (file)
--- 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 5f3f0637ce025e181a3776625f09a1c10ad2ed24..45f6f224a49239b8a7713d8aaea8425b4f0440ef 100644 (file)
--- 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 c86f2c82bb0b854ab19928ef22cf71c1b17728d7..a58545e991a4db9ac958068cb1b5ae1f27cc1337 100644 (file)
--- 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 af0e08797f3d3d78317ade486ab98109a488c8c1..459c546c8cd31a3bf9bf98d1654063f2240cc5bc 100644 (file)
--- 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>
Netconf