From 28928f5e6bc2eed57087c0094eeebaf235e784eb Mon Sep 17 00:00:00 2001
From: Carsten Lohmann <carsten.lohmann@bosch.io>
Date: Fri, 20 May 2022 10:33:43 +0200
Subject: [PATCH] [#3092] Rename service and adapter "base-quarkus" modules.

Signed-off-by: Carsten Lohmann <carsten.lohmann@bosch.io>
---
 adapters/amqp/pom.xml                     | 4 ++--
 adapters/coap/pom.xml                     | 4 ++--
 adapters/http/pom.xml                     | 4 ++--
 adapters/lora/pom.xml                     | 4 ++--
 adapters/mqtt/pom.xml                     | 4 ++--
 adapters/{base-quarkus => parent}/pom.xml | 6 +++---
 adapters/pom.xml                          | 2 +-
 adapters/sigfox/pom.xml                   | 4 ++--
 services/auth/pom.xml                     | 4 ++--
 services/command-router/pom.xml           | 4 ++--
 services/device-registry-jdbc/pom.xml     | 4 ++--
 services/device-registry-mongodb/pom.xml  | 4 ++--
 services/{base-quarkus => parent}/pom.xml | 6 +++---
 services/pom.xml                          | 2 +-
 site/homepage/content/release-notes.md    | 2 ++
 15 files changed, 30 insertions(+), 28 deletions(-)
 rename adapters/{base-quarkus => parent}/pom.xml (97%)
 rename services/{base-quarkus => parent}/pom.xml (97%)

diff --git a/adapters/amqp/pom.xml b/adapters/amqp/pom.xml
index 9d4840b1d7..dbd5e6d4bd 100644
--- a/adapters/amqp/pom.xml
+++ b/adapters/amqp/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-amqp</artifactId>
   <name>Hono AMQP Adapter</name>
diff --git a/adapters/coap/pom.xml b/adapters/coap/pom.xml
index 5054fa6b00..8f208739c3 100644
--- a/adapters/coap/pom.xml
+++ b/adapters/coap/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-coap</artifactId>
   <name>Hono CoAP Adapter</name>
diff --git a/adapters/http/pom.xml b/adapters/http/pom.xml
index 42cbea46b1..4b1b7f9e14 100644
--- a/adapters/http/pom.xml
+++ b/adapters/http/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-http</artifactId>
   <name>Hono HTTP Adapter</name>
diff --git a/adapters/lora/pom.xml b/adapters/lora/pom.xml
index 6ca7cff5b2..2535b8a17c 100644
--- a/adapters/lora/pom.xml
+++ b/adapters/lora/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-lora</artifactId>
   <name>Hono Lora Adapter</name>
diff --git a/adapters/mqtt/pom.xml b/adapters/mqtt/pom.xml
index 3b59a4ca5a..25ea0a3120 100644
--- a/adapters/mqtt/pom.xml
+++ b/adapters/mqtt/pom.xml
@@ -17,9 +17,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-mqtt</artifactId>
   <name>Hono MQTT Adapter</name>
diff --git a/adapters/base-quarkus/pom.xml b/adapters/parent/pom.xml
similarity index 97%
rename from adapters/base-quarkus/pom.xml
rename to adapters/parent/pom.xml
index ce643f7db3..3cf1d34c42 100644
--- a/adapters/base-quarkus/pom.xml
+++ b/adapters/parent/pom.xml
@@ -20,11 +20,11 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hono-adapters-quarkus</artifactId>
+  <artifactId>hono-adapters-parent</artifactId>
   <packaging>pom</packaging>
 
-  <name>Hono Protocol Adapters (Quarkus)</name>
-  <description>Defines common dependencies for Quarkus-based protocol adapter implementations</description>
+  <name>Hono Protocol Adapters Parent</name>
+  <description>Defines common dependencies and build profiles for Quarkus-based protocol adapter implementations</description>
 
   <dependencies>
     <dependency>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 39da7d7f8a..6b5ac47675 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -26,8 +26,8 @@
   <packaging>pom</packaging>
 
   <modules>
+    <module>parent</module>
     <module>amqp</module>
-    <module>base-quarkus</module>
     <module>coap</module>
     <module>http</module>
     <module>http-base</module>
diff --git a/adapters/sigfox/pom.xml b/adapters/sigfox/pom.xml
index 60c503ebf1..ffd1707e9f 100644
--- a/adapters/sigfox/pom.xml
+++ b/adapters/sigfox/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-adapters-quarkus</artifactId>
+    <artifactId>hono-adapters-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-sigfox</artifactId>
   <name>Hono Sigfox Adapter</name>
diff --git a/services/auth/pom.xml b/services/auth/pom.xml
index ae1c5cf577..23bff53dff 100644
--- a/services/auth/pom.xml
+++ b/services/auth/pom.xml
@@ -15,9 +15,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-services-quarkus</artifactId>
+    <artifactId>hono-services-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-service-auth</artifactId>
   <name>Hono Auth Server</name>
diff --git a/services/command-router/pom.xml b/services/command-router/pom.xml
index c380a58aa0..4e4943407f 100644
--- a/services/command-router/pom.xml
+++ b/services/command-router/pom.xml
@@ -15,9 +15,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-services-quarkus</artifactId>
+    <artifactId>hono-services-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-service-command-router</artifactId>
   <name>Hono Command Router</name>
diff --git a/services/device-registry-jdbc/pom.xml b/services/device-registry-jdbc/pom.xml
index 9e46707c66..28a7245b3a 100644
--- a/services/device-registry-jdbc/pom.xml
+++ b/services/device-registry-jdbc/pom.xml
@@ -16,9 +16,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-services-quarkus</artifactId>
+    <artifactId>hono-services-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/services/device-registry-mongodb/pom.xml b/services/device-registry-mongodb/pom.xml
index 3a7c866748..a95159faaa 100644
--- a/services/device-registry-mongodb/pom.xml
+++ b/services/device-registry-mongodb/pom.xml
@@ -16,9 +16,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.eclipse.hono</groupId>
-    <artifactId>hono-services-quarkus</artifactId>
+    <artifactId>hono-services-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../base-quarkus</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/services/base-quarkus/pom.xml b/services/parent/pom.xml
similarity index 97%
rename from services/base-quarkus/pom.xml
rename to services/parent/pom.xml
index 57f6a276a8..c28881706b 100644
--- a/services/base-quarkus/pom.xml
+++ b/services/parent/pom.xml
@@ -20,10 +20,10 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
-  <artifactId>hono-services-quarkus</artifactId>
+  <artifactId>hono-services-parent</artifactId>
 
-  <name>Hono Services (Quarkus)</name>
-  <description>Defines common dependencies for Quarkus-based service implementations</description>
+  <name>Hono Services Parent</name>
+  <description>Defines common dependencies and build profiles for Quarkus-based service implementations</description>
 
   <properties>
     <!-- delegate verification of credentials to Authentication server by default -->
diff --git a/services/pom.xml b/services/pom.xml
index 4803545b82..7c20b71f85 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -26,10 +26,10 @@
   <packaging>pom</packaging>
 
   <modules>
+    <module>parent</module>
     <module>auth</module>
     <module>auth-base</module>
     <module>base-jdbc</module>
-    <module>base-quarkus</module>
     <module>command-router</module>
     <module>device-registry-base</module>
     <module>device-registry-jdbc</module>
diff --git a/site/homepage/content/release-notes.md b/site/homepage/content/release-notes.md
index bb8a25aaf9..af63dd2b64 100644
--- a/site/homepage/content/release-notes.md
+++ b/site/homepage/content/release-notes.md
@@ -108,6 +108,8 @@ description = "Information about changes in recent Hono releases. Includes new f
   line client as well.
 * The Hono protocol adapter, command router and device registry Maven modules and Docker images have been renamed,
   removing the *-vertx* and *-quarkus* parts from the names.
+* The *hono-adapters-quarkus* and *hono-services-quarkus* Maven modules, used as parent modules for protocol adapter
+  and service implementations, have been renamed to *hono-adapters-parent* and *hono-services-parent*, respectively.
 
 ### Deprecations