From e98932dd319b387dbd972187e472a275dfa081f6 Mon Sep 17 00:00:00 2001
From: pierantoniomerlino <pierantonio.merlino@eurotech.com>
Date: Wed, 4 Sep 2024 12:17:42 +0200
Subject: [PATCH] Renamed core.cloud in cloudconnection.kapua.mqtt.provider

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
---
 kura/distrib/config/kura.build.properties     |  2 +-
 kura/distrib/pom.xml                          | 19 +++++++++----------
 .../src/main/ant/build_equinox_distrib.xml    | 17 +++++++++++++----
 .../.gitignore                                |  0
 .../META-INF/MANIFEST.MF                      |  6 +++---
 .../OSGI-INF/cloud.xml                        |  0
 .../OSGI-INF/cloudCall.xml                    |  0
 .../OSGI-INF/cloudPublisher.xml               |  0
 .../OSGI-INF/cloudSubscriber.xml              |  0
 .../org.eclipse.kura.cloud.CloudService.xml   |  0
 ...se.kura.cloud.publisher.CloudPublisher.xml |  0
 ....kura.cloud.subscriber.CloudSubscriber.xml |  0
 .../about.html                                |  0
 .../about_files/epl-v20.html                  |  0
 .../build.properties                          |  0
 .../pom.xml                                   |  8 ++++----
 .../kura/cloud/app/RequestIdGenerator.java    |  0
 .../kura/core/cloud/CloudClientImpl.java      |  0
 .../cloud/CloudClientListenerAdapter.java     |  0
 .../kura/core/cloud/CloudPayloadEncoder.java  |  0
 .../core/cloud/CloudPayloadGZipEncoder.java   |  0
 .../CloudPayloadProtoBufDecoderImpl.java      |  0
 .../CloudPayloadProtoBufEncoderImpl.java      |  0
 .../cloud/CloudPublisherDeliveryListener.java |  0
 .../kura/core/cloud/CloudServiceImpl.java     |  0
 .../kura/core/cloud/CloudServiceOptions.java  |  0
 .../kura/core/cloud/KuraTopicImpl.java        |  0
 .../core/cloud/LifeCyclePayloadBuilder.java   |  0
 .../kura/core/cloud/LifecycleMessage.java     |  0
 .../core/cloud/MessageHandlerCallable.java    |  0
 .../core/cloud/call/CloudCallServiceImpl.java |  0
 .../cloud/publisher/CloudPublisherImpl.java   |  0
 .../publisher/CloudPublisherOptions.java      |  0
 .../publisher/NotificationPublisherImpl.java  |  0
 .../cloud/subscriber/CloudSubscriberImpl.java |  0
 .../subscriber/CloudSubscriberOptions.java    |  0
 .../subscriber/CloudSubscriptionRecord.java   |  0
 .../kura/core/message/MessageConstants.java   |  0
 .../kura/core/message/MessageType.java        |  0
 .../message/protobuf/KuraPayloadProto.java    |  0
 .../src/main/protobuf/kurapayload.proto       |  0
 kura/pom.xml                                  |  2 +-
 .../.gitignore                                |  0
 .../META-INF/MANIFEST.MF                      |  6 +++---
 .../OSGI-INF/cloud-publisher.xml              |  0
 .../OSGI-INF/cloud-test.xml                   |  0
 .../about.html                                |  0
 .../build.properties                          |  0
 .../pom.xml                                   |  4 ++--
 .../core/cloud/CloudPublisherImplTest.java    |  0
 .../kura/core/cloud/CloudServiceTest.java     |  0
 .../kura/core/cloud/BirthMessagesTest.java    |  0
 .../kura/core/cloud/CloudClientImplTest.java  |  0
 .../kura/core/cloud/CloudServiceImplTest.java |  0
 .../core/cloud/CloudServiceOptionsTest.java   |  0
 .../publisher/CloudPublisherImplTest.java     |  0
 .../publisher/CloudPublisherOptionsTest.java  |  0
 .../NotificationPublisherImplTest.java        |  0
 .../core/message/KuraBirthPayloadTest.java    |  0
 .../message/KuraDisconnectPayloadTest.java    |  0
 .../protobuf/KuraPayloadProtoBuilderTest.java |  0
 .../KuraPayloadProtoMetricBuilderTest.java    |  0
 .../KuraPayloadProtoPositionBuilderTest.java  |  0
 .../src/test/resources/log4j.properties       |  0
 kura/test/pom.xml                             |  2 +-
 65 files changed, 37 insertions(+), 29 deletions(-)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/.gitignore (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/META-INF/MANIFEST.MF (92%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/cloud.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/cloudCall.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/cloudPublisher.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/cloudSubscriber.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/metatype/org.eclipse.kura.cloud.CloudService.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/metatype/org.eclipse.kura.cloud.publisher.CloudPublisher.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/OSGI-INF/metatype/org.eclipse.kura.cloud.subscriber.CloudSubscriber.xml (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/about.html (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/about_files/epl-v20.html (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/build.properties (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/pom.xml (85%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/cloud/app/RequestIdGenerator.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudClientImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudClientListenerAdapter.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadEncoder.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadGZipEncoder.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufDecoderImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufEncoderImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherDeliveryListener.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudServiceImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/CloudServiceOptions.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/KuraTopicImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/LifeCyclePayloadBuilder.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/LifecycleMessage.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/MessageHandlerCallable.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/call/CloudCallServiceImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptions.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberImpl.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberOptions.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriptionRecord.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/message/MessageConstants.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/message/MessageType.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProto.java (100%)
 rename kura/{org.eclipse.kura.core.cloud => org.eclipse.kura.cloudconnection.kapua.mqtt.provider}/src/main/protobuf/kurapayload.proto (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/.gitignore (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/META-INF/MANIFEST.MF (79%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/OSGI-INF/cloud-publisher.xml (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/OSGI-INF/cloud-test.xml (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/about.html (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/build.properties (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/pom.xml (94%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherImplTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/main/java/org/eclipse/kura/core/cloud/CloudServiceTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/BirthMessagesTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/CloudClientImplTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/CloudServiceImplTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/CloudServiceOptionsTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImplTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptionsTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImplTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/message/KuraBirthPayloadTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/message/KuraDisconnectPayloadTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoBuilderTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoMetricBuilderTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoPositionBuilderTest.java (100%)
 rename kura/test/{org.eclipse.kura.core.cloud.test => org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test}/src/test/resources/log4j.properties (100%)

diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
index 388e11a81cf..3591a5e54c5 100644
--- a/kura/distrib/config/kura.build.properties
+++ b/kura/distrib/config/kura.build.properties
@@ -10,7 +10,6 @@ org.eclipse.kura.core.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.system.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.certificates.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.keystore.version=2.0.0-SNAPSHOT
-org.eclipse.kura.core.cloud.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.cloud.command.version=1.0.0-SNAPSHOT
 org.eclipse.kura.core.cloud.factory.version=2.0.0-SNAPSHOT
 org.eclipse.kura.core.comm.version=2.0.0-SNAPSHOT
@@ -133,6 +132,7 @@ org.eclipse.kura.db.sqlite.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.rest.network.status.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.wire.script.tools.version=2.0.0-SNAPSHOT
 org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.version=2.0.0-SNAPSHOT
+org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version=1.0.0-SNAPSHOT
 
 ## features versions
 org.eclipse.kura.driver.opcua.version=2.0.0-SNAPSHOT
diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
index 8b261153b31..426ec20e7cb 100644
--- a/kura/distrib/pom.xml
+++ b/kura/distrib/pom.xml
@@ -81,7 +81,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-6</version>
+                <version>>1.0-beta-6</version>
             </extension>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -216,11 +216,6 @@
                                     <artifactId>org.eclipse.kura.core.certificates</artifactId>
                                     <version>${org.eclipse.kura.core.certificates.version}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.kura</groupId>
-                                    <artifactId>org.eclipse.kura.core.cloud</artifactId>
-                                    <version>${org.eclipse.kura.core.cloud.version}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.core.cloud.command</artifactId>
@@ -556,6 +551,11 @@
                                     <artifactId>org.eclipse.kura.cloudconnection.raw.mqtt.provider</artifactId>
                                     <version>${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.kura</groupId>
+                                    <artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</artifactId>
+                                    <version>${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}</version>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.useradmin.store</artifactId>
@@ -752,7 +752,6 @@
                                 <move file="target/plugins/org.eclipse.kura.core.jar" tofile="target/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.system.jar" tofile="target/plugins/org.eclipse.kura.core.system_${org.eclipse.kura.core.system.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.certificates.jar" tofile="target/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" />
-                                <move file="target/plugins/org.eclipse.kura.core.cloud.jar" tofile="target/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.cloud.command.jar" tofile="target/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.cloud.factory.jar" tofile="target/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.core.comm.jar" tofile="target/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" />
@@ -816,6 +815,7 @@
                                 <move file="target/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider.jar" tofile="target/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.wire.component.join.provider.jar" tofile="target/plugins/org.eclipse.kura.wire.component.join.provider_${org.eclipse.kura.wire.component.join.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" />
+                                <move file="target/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.http.server.manager.jar" tofile="target/plugins/org.eclipse.kura.http.server.manager_${org.eclipse.kura.http.server.manager.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider.jar" tofile="target/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.useradmin.store.jar" tofile="target/plugins/org.eclipse.kura.useradmin.store_${org.eclipse.kura.useradmin.store.version}.jar" />
@@ -2025,8 +2025,7 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.xml_${org.eclipse.kura.camel.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.configuration_${org.eclipse.kura.core.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
@@ -2085,7 +2084,7 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
 
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-
+										<copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.ai.triton.server_${org.eclipse.kura.ai.triton.server.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 75007d85337..77b158b947b 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -140,6 +140,7 @@
         <antcall target="core.system-config" />
         <antcall target="core.certificates-config" />
         <antcall target="core.cloud-config" />
+    	<antcall target="cloud.mqtt.kapua-config" />
         <antcall target="cloud.mqtt.eclipseiot-config" />
         <antcall target="cloud.mqtt.raw-config" />
         <antcall target="core.comm-config" />
@@ -589,9 +590,6 @@ fi]]>
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
-            <zipfileset
-                file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud_${org.eclipse.kura.core.cloud.version}.jar"
-                prefix="${build.output.name}/${plugins.folder}" />
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
@@ -604,6 +602,9 @@ fi]]>
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
+            <zipfileset
+                file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar"
+                prefix="${build.output.name}/${plugins.folder}" />
             <zipfileset
                 file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
@@ -989,7 +990,15 @@ fi]]>
                 value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar@4:start" />
         </propertyfile>
     </target>
-
+	
+    <target name="cloud.mqtt.kapua-config">
+        <propertyfile
+            file="${project.build.directory}/${build.output.name}/config.ini">
+            <entry key="osgi.bundles" operation="+"
+                value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar@4:start" />
+        </propertyfile>
+    </target>
+	
     <target name="cloud.mqtt.eclipseiot-config">
         <propertyfile
             file="${project.build.directory}/${build.output.name}/config.ini">
diff --git a/kura/org.eclipse.kura.core.cloud/.gitignore b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/.gitignore
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/.gitignore
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/.gitignore
diff --git a/kura/org.eclipse.kura.core.cloud/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/META-INF/MANIFEST.MF
similarity index 92%
rename from kura/org.eclipse.kura.core.cloud/META-INF/MANIFEST.MF
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/META-INF/MANIFEST.MF
index 94362eb79b1..82b236ab506 100644
--- a/kura/org.eclipse.kura.core.cloud/META-INF/MANIFEST.MF
+++ b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.kura.core.cloud
-Bundle-SymbolicName: org.eclipse.kura.core.cloud;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Name: org.eclipse.kura.cloudconnection.kapua.mqtt.provider
+Bundle-SymbolicName: org.eclipse.kura.cloudconnection.kapua.mqtt.provider;singleton:=true
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Kura
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
 Service-Component: OSGI-INF/*.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/cloud.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloud.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/cloud.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloud.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudCall.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudCall.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudCall.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudCall.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudPublisher.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudPublisher.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudPublisher.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudPublisher.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudSubscriber.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudSubscriber.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/cloudSubscriber.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/cloudSubscriber.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.CloudService.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.CloudService.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.CloudService.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.CloudService.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.publisher.CloudPublisher.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.publisher.CloudPublisher.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.publisher.CloudPublisher.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.publisher.CloudPublisher.xml
diff --git a/kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.subscriber.CloudSubscriber.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.subscriber.CloudSubscriber.xml
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/OSGI-INF/metatype/org.eclipse.kura.cloud.subscriber.CloudSubscriber.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/OSGI-INF/metatype/org.eclipse.kura.cloud.subscriber.CloudSubscriber.xml
diff --git a/kura/org.eclipse.kura.core.cloud/about.html b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/about.html
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/about.html
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/about.html
diff --git a/kura/org.eclipse.kura.core.cloud/about_files/epl-v20.html b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/about_files/epl-v20.html
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/about_files/epl-v20.html
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/about_files/epl-v20.html
diff --git a/kura/org.eclipse.kura.core.cloud/build.properties b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/build.properties
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/build.properties
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/build.properties
diff --git a/kura/org.eclipse.kura.core.cloud/pom.xml b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/pom.xml
similarity index 85%
rename from kura/org.eclipse.kura.core.cloud/pom.xml
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/pom.xml
index 509fef3ec9b..02bc253c379 100644
--- a/kura/org.eclipse.kura.core.cloud/pom.xml
+++ b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
+    Copyright (c) 2024 Eurotech and/or its affiliates and others
   
     This program and the accompanying materials are made
     available under the terms of the Eclipse Public License 2.0
@@ -23,13 +23,13 @@
 		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.eclipse.kura.core.cloud</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
 		<kura.basedir>${project.basedir}/..</kura.basedir>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.core.cloud.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
 
 	<build>
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/cloud/app/RequestIdGenerator.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/cloud/app/RequestIdGenerator.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/cloud/app/RequestIdGenerator.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/cloud/app/RequestIdGenerator.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudClientImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudClientImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudClientImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudClientImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudClientListenerAdapter.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudClientListenerAdapter.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudClientListenerAdapter.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudClientListenerAdapter.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadEncoder.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadEncoder.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadEncoder.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadEncoder.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadGZipEncoder.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadGZipEncoder.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadGZipEncoder.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadGZipEncoder.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufDecoderImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufDecoderImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufDecoderImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufDecoderImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufEncoderImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufEncoderImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufEncoderImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPayloadProtoBufEncoderImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherDeliveryListener.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherDeliveryListener.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherDeliveryListener.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherDeliveryListener.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudServiceImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudServiceImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudServiceImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudServiceImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudServiceOptions.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudServiceOptions.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/CloudServiceOptions.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/CloudServiceOptions.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/KuraTopicImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/KuraTopicImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/KuraTopicImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/KuraTopicImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/LifeCyclePayloadBuilder.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/LifeCyclePayloadBuilder.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/LifeCyclePayloadBuilder.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/LifeCyclePayloadBuilder.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/LifecycleMessage.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/LifecycleMessage.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/LifecycleMessage.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/LifecycleMessage.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/MessageHandlerCallable.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/MessageHandlerCallable.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/MessageHandlerCallable.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/MessageHandlerCallable.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/call/CloudCallServiceImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/call/CloudCallServiceImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/call/CloudCallServiceImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/call/CloudCallServiceImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptions.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptions.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptions.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptions.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberImpl.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberImpl.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberImpl.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberImpl.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberOptions.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberOptions.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberOptions.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriberOptions.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriptionRecord.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriptionRecord.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriptionRecord.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/cloud/subscriber/CloudSubscriptionRecord.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/MessageConstants.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/MessageConstants.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/MessageConstants.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/MessageConstants.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/MessageType.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/MessageType.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/MessageType.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/MessageType.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProto.java b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProto.java
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProto.java
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProto.java
diff --git a/kura/org.eclipse.kura.core.cloud/src/main/protobuf/kurapayload.proto b/kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/protobuf/kurapayload.proto
similarity index 100%
rename from kura/org.eclipse.kura.core.cloud/src/main/protobuf/kurapayload.proto
rename to kura/org.eclipse.kura.cloudconnection.kapua.mqtt.provider/src/main/protobuf/kurapayload.proto
diff --git a/kura/pom.xml b/kura/pom.xml
index 0bd62fc73d0..ca67fdd0181 100644
--- a/kura/pom.xml
+++ b/kura/pom.xml
@@ -40,7 +40,6 @@
         <module>org.eclipse.kura.core</module>
         <module>org.eclipse.kura.core.certificates</module>
         <module>org.eclipse.kura.core.keystore</module>
-        <module>org.eclipse.kura.core.cloud</module>
         <module>org.eclipse.kura.core.cloud.command</module>
         <module>org.eclipse.kura.core.cloud.factory</module>
         <module>org.eclipse.kura.core.comm</module>
@@ -128,6 +127,7 @@
         <module>org.eclipse.kura.db.sqlite.provider</module>
         <module>org.eclipse.kura.rest.network.status.provider</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider</module>
+        <module>org.eclipse.kura.cloudconnection.kapua.mqtt.provider</module>
         <module>emulator</module>
         <module>test-util</module>
     </modules>
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/.gitignore b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/.gitignore
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/.gitignore
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/.gitignore
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/META-INF/MANIFEST.MF
similarity index 79%
rename from kura/test/org.eclipse.kura.core.cloud.test/META-INF/MANIFEST.MF
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/META-INF/MANIFEST.MF
index 3e20fd35aae..4db8a882c06 100644
--- a/kura/test/org.eclipse.kura.core.cloud.test/META-INF/MANIFEST.MF
+++ b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.kura.core.cloud.test
-Bundle-SymbolicName: org.eclipse.kura.core.cloud.test;singleton:=true
+Bundle-Name: org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test
+Bundle-SymbolicName: org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test;singleton:=true
 Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: Eclipse Kura
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
@@ -19,7 +19,7 @@ Import-Package: org.eclipse.kura.core.testutil,
  org.mockito.stubbing;version="[4.0.0,5.0.0)",
  org.osgi.service.cm;version="1.4.0",
  org.slf4j;version="1.6.4"
-Fragment-Host: org.eclipse.kura.core.cloud;bundle-version="1.2.0"
+Fragment-Host: org.eclipse.kura.cloudconnection.kapua.mqtt.provider
 Require-Bundle: org.eclipse.kura.broker.artemis.core;bundle-version="1.2.0",
  org.eclipse.kura.broker.artemis.simple.mqtt;bundle-version="1.1.0"
 
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/OSGI-INF/cloud-publisher.xml b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/OSGI-INF/cloud-publisher.xml
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/OSGI-INF/cloud-publisher.xml
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/OSGI-INF/cloud-publisher.xml
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/OSGI-INF/cloud-test.xml b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/OSGI-INF/cloud-test.xml
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/OSGI-INF/cloud-test.xml
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/OSGI-INF/cloud-test.xml
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/about.html b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/about.html
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/about.html
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/about.html
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/build.properties b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/build.properties
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/build.properties
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/build.properties
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/pom.xml b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/pom.xml
similarity index 94%
rename from kura/test/org.eclipse.kura.core.cloud.test/pom.xml
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/pom.xml
index af220b8085c..ab32c259f01 100644
--- a/kura/test/org.eclipse.kura.core.cloud.test/pom.xml
+++ b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
+    Copyright (c) 2024 Eurotech and/or its affiliates and others
 
     This program and the accompanying materials are made
     available under the terms of the Eclipse Public License 2.0
@@ -23,7 +23,7 @@
 		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.eclipse.kura.core.cloud.test</artifactId>
+	<artifactId>org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherImplTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherImplTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherImplTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/main/java/org/eclipse/kura/core/cloud/CloudPublisherImplTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/main/java/org/eclipse/kura/core/cloud/CloudServiceTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/main/java/org/eclipse/kura/core/cloud/CloudServiceTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/main/java/org/eclipse/kura/core/cloud/CloudServiceTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/main/java/org/eclipse/kura/core/cloud/CloudServiceTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/BirthMessagesTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/BirthMessagesTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/BirthMessagesTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/BirthMessagesTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudClientImplTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudClientImplTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudClientImplTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudClientImplTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceImplTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceImplTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceImplTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceImplTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceOptionsTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceOptionsTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceOptionsTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/CloudServiceOptionsTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImplTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImplTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImplTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherImplTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptionsTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptionsTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptionsTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/CloudPublisherOptionsTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImplTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImplTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImplTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/cloud/publisher/NotificationPublisherImplTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/KuraBirthPayloadTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/KuraBirthPayloadTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/KuraBirthPayloadTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/KuraBirthPayloadTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/KuraDisconnectPayloadTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/KuraDisconnectPayloadTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/KuraDisconnectPayloadTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/KuraDisconnectPayloadTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoBuilderTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoBuilderTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoBuilderTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoBuilderTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoMetricBuilderTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoMetricBuilderTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoMetricBuilderTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoMetricBuilderTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoPositionBuilderTest.java b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoPositionBuilderTest.java
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoPositionBuilderTest.java
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/java/org/eclipse/kura/core/message/protobuf/KuraPayloadProtoPositionBuilderTest.java
diff --git a/kura/test/org.eclipse.kura.core.cloud.test/src/test/resources/log4j.properties b/kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/resources/log4j.properties
similarity index 100%
rename from kura/test/org.eclipse.kura.core.cloud.test/src/test/resources/log4j.properties
rename to kura/test/org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test/src/test/resources/log4j.properties
diff --git a/kura/test/pom.xml b/kura/test/pom.xml
index fe129729e01..7846b89495a 100644
--- a/kura/test/pom.xml
+++ b/kura/test/pom.xml
@@ -883,7 +883,6 @@
         <module>org.eclipse.kura.core.certificates.test</module>
         <module>org.eclipse.kura.core.comm.test</module>
         <module>org.eclipse.kura.core.configuration.test</module>
-        <module>org.eclipse.kura.core.cloud.test</module>
         <module>org.eclipse.kura.core.cloud.command.test</module>
         <module>org.eclipse.kura.core.cloud.factory.test</module>
         <module>org.eclipse.kura.core.crypto.test</module>
@@ -964,6 +963,7 @@
         <module>org.eclipse.kura.db.sqlite.provider.test</module>
         <module>org.eclipse.kura.message.store.provider.test</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.test</module>
+        <module>org.eclipse.kura.cloudconnection.kapua.mqtt.provider.test</module>
         <!--
         <module>org.eclipse.kura.raspberrypi.sensehat.test</module>
         -->