[#3092] Rename adapter modules

.github/workflows/native-images-tests.yml

@@ -44,7 +44,7 @@ jobs:
         -Dquarkus.native.remote-container-build=false -Dquarkus.native.container-build=true \
         -Pbuild-native-image -am \
         -pl :hono-service-auth-quarkus,:hono-service-command-router-quarkus,:hono-service-device-registry-mongodb-quarkus,\
-        :hono-adapter-mqtt-vertx-quarkus,:hono-adapter-amqp-vertx-quarkus,:hono-adapter-coap-vertx-quarkus,:hono-adapter-http-vertx-quarkus,\
+        :hono-adapter-mqtt,:hono-adapter-amqp,:hono-adapter-coap,:hono-adapter-http,\
         :hono-tests
     - name: "Build JDBC registry image"
       run: |

CODEOWNERS

@@ -3,17 +3,17 @@
 /adapter-base/                        @dejanb @sophokles73
 
 /adapters/                            @calohmn @kaniyan
-/adapters/amqp-vertx-quarkus/         @calohmn
+/adapters/amqp/                       @calohmn
 
-/adapters/coap-vertx-quarkus/         @sophokles73
+/adapters/coap/                       @sophokles73
 
-/adapters/http-vertx-base/            @ctron @calohmn
-/adapters/http-vertx-quarkus/         @ctron @calohmn
+/adapters/http/                       @ctron @calohmn
+/adapters/http-base/                  @ctron @calohmn
 
-/adapters/lora-vertx-quarkus/         @calohmn
+/adapters/lora/                       @calohmn
 
-/adapters/mqtt-vertx-base/            @ctron @kaniyan
-/adapters/mqtt-vertx-quarkus/         @ctron @kaniyan
+/adapters/mqtt/                       @ctron @kaniyan
+/adapters/mqtt-base/                  @ctron @kaniyan
 
 /adapters/sigfox-vertx/               @ctron
 

adapters/amqp-vertx-quarkus/pom.xml → adapters/amqp/pom.xml

@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-amqp-vertx-quarkus</artifactId>
-  <name>Hono AMQP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-amqp</artifactId>
+  <name>Hono AMQP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via AMQP.</description>
   <url>https://www.eclipse.org/hono</url>

adapters/coap-vertx-quarkus/pom.xml → adapters/coap/pom.xml

@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-coap-vertx-quarkus</artifactId>
-  <name>Hono CoAP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-coap</artifactId>
+  <name>Hono CoAP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via CoAP.</description>
   <url>https://www.eclipse.org/hono</url>

adapters/http-vertx-base/pom.xml → adapters/http-base/pom.xml

@@ -19,7 +19,7 @@
     <artifactId>hono-adapters</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hono-adapter-http-vertx-base</artifactId>
+  <artifactId>hono-adapter-http-base</artifactId>
   <name>Hono HTTP Adapter base</name>
   <url>https://www.eclipse.org/hono</url>
 

adapters/http-vertx-quarkus/README.md → adapters/http/README.md

@@ -1,4 +1,4 @@
-# hono-adapter-http-vertx-quarkus project
+# hono-adapter-http project
 
 This module contains Hono HTTP protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-http-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-http-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-http-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 

adapters/http-vertx-quarkus/pom.xml → adapters/http/pom.xml

@@ -20,16 +20,16 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-http-vertx-quarkus</artifactId>
-  <name>Hono HTTP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-http</artifactId>
+  <name>Hono HTTP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via HTTP.</description>
   <url>https://www.eclipse.org/hono</url>
 
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>

adapters/lora-vertx-quarkus/README.md → adapters/lora/README.md

@@ -1,4 +1,4 @@
-# hono-adapter-lora-vertx-quarkus project
+# hono-adapter-lora project
 
 This module contains Hono Lora protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-lora-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-lora-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-lora-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 

adapters/lora-vertx-quarkus/pom.xml → adapters/lora/pom.xml

@@ -20,16 +20,16 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-lora-vertx-quarkus</artifactId>
-  <name>Hono Lora Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-lora</artifactId>
+  <name>Hono Lora Adapter</name>
 
   <description>A Quarkus based protocol adapter for connecting LoRa Backend Services like Kerlink or TTN.</description>
   <url>https://www.eclipse.org/hono</url>
 
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

adapters/mqtt-vertx-base/pom.xml → adapters/mqtt-base/pom.xml

@@ -18,7 +18,7 @@
     <artifactId>hono-adapters</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hono-adapter-mqtt-vertx-base</artifactId>
+  <artifactId>hono-adapter-mqtt-base</artifactId>
   <name>Hono MQTT Adapter base</name>
   <dependencies>
     <dependency>

adapters/mqtt-vertx-quarkus/README.md → adapters/mqtt/README.md

@@ -1,4 +1,4 @@
-# hono-adapter-mqtt-vertx-quarkus project
+# hono-adapter-mqtt project
 
 This module contains Hono MQTT protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-mqtt-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-mqtt-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-mqtt-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 

adapters/mqtt-vertx-quarkus/pom.xml → adapters/mqtt/pom.xml

@@ -21,16 +21,16 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-mqtt-vertx-quarkus</artifactId>
-  <name>Hono MQTT Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-mqtt</artifactId>
+  <name>Hono MQTT Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via MQTT.</description>
   <url>https://www.eclipse.org/hono</url>
 
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-mqtt-vertx-base</artifactId>
+      <artifactId>hono-adapter-mqtt-base</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>

adapters/pom.xml

@@ -26,15 +26,15 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>amqp-vertx-quarkus</module>
+    <module>amqp</module>
     <module>base-quarkus</module>
-    <module>coap-vertx-quarkus</module>
-    <module>http-vertx-base</module>
-    <module>http-vertx-quarkus</module>
-    <module>lora-vertx-quarkus</module>
-    <module>mqtt-vertx-base</module>
-    <module>mqtt-vertx-quarkus</module>
-    <module>sigfox-vertx</module>
+    <module>coap</module>
+    <module>http</module>
+    <module>http-base</module>
+    <module>lora</module>
+    <module>mqtt</module>
+    <module>mqtt-base</module>
+    <module>sigfox</module>
   </modules>
 
   <name>Hono Protocol Adapters</name>

adapters/sigfox-vertx/pom.xml → adapters/sigfox/pom.xml

@@ -20,16 +20,16 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-sigfox-vertx-quarkus</artifactId>
-  <name>Hono Sigfox Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-sigfox</artifactId>
+  <name>Hono Sigfox Adapter</name>
 
   <description>A Quarkus based protocol adapter for connecting to the Sigfox backend.</description>
   <url>https://www.eclipse.org/hono</url>
 
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy

@@ -129,12 +129,12 @@ spec:
           sh "mvn deploy \
                 -DskipTests=true -DnoDocker -DcreateJavadoc=true -DenableEclipseJarSigner=true -DskipStaging=true
                 -am -pl '\
-                  :hono-adapter-amqp-vertx-quarkus,\
-                  :hono-adapter-coap-vertx-quarkus,\
-                  :hono-adapter-http-vertx-quarkus,\
-                  :hono-adapter-lora-vertx-quarkus,\
-                  :hono-adapter-mqtt-vertx-quarkus,\
-                  :hono-adapter-sigfox-vertx-quarkus,\
+                  :hono-adapter-amqp,\
+                  :hono-adapter-coap,\
+                  :hono-adapter-http,\
+                  :hono-adapter-lora,\
+                  :hono-adapter-mqtt,\
+                  :hono-adapter-sigfox,\
                   :hono-cli,\
                   :hono-example,\
                   :hono-service-auth-quarkus,\

jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy

@@ -132,12 +132,12 @@ spec:
           sh "mvn deploy \
                 -DskipTests=true -DnoDocker -DcreateGPGSignature=true -DcreateJavadoc=true -DenableEclipseJarSigner=true
                 -am -pl '\
-                  :hono-adapter-amqp-vertx-quarkus,\
-                  :hono-adapter-coap-vertx-quarkus,\
-                  :hono-adapter-http-vertx-quarkus,\
-                  :hono-adapter-lora-vertx-quarkus,\
-                  :hono-adapter-mqtt-vertx-quarkus,\
-                  :hono-adapter-sigfox-vertx-quarkus,\
+                  :hono-adapter-amqp,\
+                  :hono-adapter-coap,\
+                  :hono-adapter-http,\
+                  :hono-adapter-lora,\
+                  :hono-adapter-mqtt,\
+                  :hono-adapter-sigfox,\
                   :hono-cli,\
                   :hono-example,\
                   :hono-service-auth-quarkus,\

push_hono_images.sh

@@ -14,23 +14,23 @@
 
 TAG=$1
 CR=$2
-IMAGES="hono-adapter-amqp-vertx-quarkus \
-        hono-adapter-coap-vertx-quarkus \
-        hono-adapter-http-vertx-quarkus \
-        hono-adapter-lora-vertx-quarkus \
-        hono-adapter-mqtt-vertx-quarkus \
-        hono-adapter-sigfox-vertx-quarkus \
+IMAGES="hono-adapter-amqp \
+        hono-adapter-coap \
+        hono-adapter-http \
+        hono-adapter-lora \
+        hono-adapter-mqtt \
+        hono-adapter-sigfox \
         hono-service-auth-quarkus \
         hono-service-command-router-quarkus \
         hono-service-device-registry-jdbc-quarkus \
         hono-service-device-registry-mongodb-quarkus"
 
-NATIVE_IMAGES="hono-adapter-amqp-vertx-quarkus-native \
-        hono-adapter-coap-vertx-quarkus-native \
-        hono-adapter-http-vertx-quarkus-native \
-        hono-adapter-lora-vertx-quarkus-native \
-        hono-adapter-mqtt-vertx-quarkus-native \
-        hono-adapter-sigfox-vertx-quarkus-native \
+NATIVE_IMAGES="hono-adapter-amqp-native \
+        hono-adapter-coap-native \
+        hono-adapter-http-native \
+        hono-adapter-lora-native \
+        hono-adapter-mqtt-native \
+        hono-adapter-sigfox-native \
         hono-service-auth-quarkus-native \
         hono-service-command-router-quarkus-native \
         hono-service-device-registry-mongodb-quarkus-native"

site/documentation/content/admin-guide/amqp-adapter-config.md

@@ -8,7 +8,7 @@ Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by
-means of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-amqp-vertx-quarkus/)
+means of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-amqp/)
 created from it.
 
 {{% notice info %}}

site/documentation/content/admin-guide/coap-adapter-config.md

@@ -9,7 +9,7 @@ Command & Control APIs.
 
 The adapter is implemented as a Quarkus application using [Eclipse Californium™](https://www.eclipse.org/californium/)
 for implementing the CoAP protocol handling. It can be run either directly from the command line or by means of starting
-the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-coap-vertx-quarkus/) created from it.
+the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-coap/) created from it.
 
 {{% notice info %}}
 The CoAP adapter had originally been implemented as a Spring Boot application. That variant has been removed in Hono

site/documentation/content/admin-guide/http-adapter-config.md

@@ -8,7 +8,7 @@ Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by means
-of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-http-vertx-quarkus/)
+of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-http/)
 created from it.
 
 {{% notice info %}}

site/documentation/content/admin-guide/mqtt-adapter-config.md

@@ -8,7 +8,7 @@ and Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by means
-of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-mqtt-vertx-quarkus/)
+of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-mqtt/)
 created from it.
 
 {{% notice info %}}

site/documentation/content/deployment/helm-based-deployment.md

@@ -59,11 +59,11 @@ commandRouterService:
   imageName: "my.registry.io/eclipse/hono-service-command-router-quarkus:1.12.0-CUSTOM"
 adapters:
   amqp:
-    imageName: "my.registry.io/eclipse/hono-adapter-amqp-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-amqp:2.0.0-CUSTOM"
   mqtt:
-    imageName: "my.registry.io/eclipse/hono-adapter-mqtt-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-mqtt:2.0.0-CUSTOM"
   http:
-    imageName: "my.registry.io/eclipse/hono-adapter-http-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-http:2.0.0-CUSTOM"
 ```
 
 Assuming that the YAML file is called `imageNames.yaml`, installation can then be done using:

site/documentation/content/deployment/resource-limitation.md

@@ -65,7 +65,7 @@ spec:
         group: ${project.groupId}
     spec:
       containers:
-      - image: eclipse/hono-adapter-http-vertx-quarkus:${project.version}
+      - image: eclipse/hono-adapter-http:${project.version}
         name: eclipse-hono-adapter-http-vertx
         resources:
           limits:

site/documentation/content/dev-guide/custom_http_adapter.md

@@ -18,7 +18,7 @@ You should be familiar with the setup and start of Hono. Refer to the
 
 Hono's HTTP Adapter supports telemetry and event data processing. Please refer to the [HTTP Adapter User Guide]({{< relref "/user-guide/http-adapter.md" >}}) and [HTTP Adapter Admin Guide]({{< relref "/admin-guide/http-adapter-config.md" >}}) for details regarding the usage and configuration of the HTTP Adapter.
 
-You can find the source of the HTTP Adapter at <https://github.com/eclipse/hono/tree/master/adapters/http-vertx-quarkus>.
+You can find the source of the HTTP Adapter at <https://github.com/eclipse/hono/tree/master/adapters/http>.
 
 ## Anatomy of the standard HTTP Adapter