From b231173250c4f83f178ac45357a08aed6330af18 Mon Sep 17 00:00:00 2001
From: Pierantonio Merlino <pierantonio.merlino@eurotech.com>
Date: Thu, 5 Sep 2024 10:32:18 +0200
Subject: [PATCH] refactor(core)!: Added H2Db provider bundle (#5343)

* Added db.h2db.provider bundle

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Removed H2Db code from core bundle

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Added new bundle in distrib

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Updated names in component definitions

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Fixed tests

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Removed core.db test

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Fixed some sonar issues

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Tried to fix sonar complain

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Fixed copyright; fixed import order

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

* Fixed copyright

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

---------

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
---
 kura/distrib/config/kura.build.properties     |   1 +
 kura/distrib/pom.xml                          |   7 +
 .../src/main/ant/build_equinox_distrib.xml    |  19 ++
 .../META-INF/MANIFEST.MF                      |   9 -
 .../kura/core/data/DataServiceImpl.java       |  39 +--
 .../kura/core/data/DataServiceOptions.java    |  13 +-
 .../.gitignore                                |   1 +
 .../META-INF/MANIFEST.MF                      |  33 ++
 .../OSGI-INF/h2db.xml                         |   4 +-
 .../OSGI-INF/h2dbhelper.xml                   |   4 +-
 .../OSGI-INF/h2dbserver.xml                   |   4 +-
 .../org.eclipse.kura.core.db.H2DbServer.xml   |   2 +-
 .../org.eclipse.kura.core.db.H2DbService.xml  |   2 +-
 .../about.html                                |   0
 .../about_files/epl-v20.html                  | 301 ++++++++++++++++++
 .../build.properties                          |  23 ++
 .../org.eclipse.kura.db.h2db.provider/pom.xml |  35 ++
 .../db/h2db/provider}/H2DbHelper.java         |   8 +-
 .../h2db/provider}/H2DbMessageStoreImpl.java  |   4 +-
 .../H2DbQueryableWireRecordStoreImpl.java     |   4 +-
 .../db/h2db/provider}/H2DbServer.java         |   4 +-
 .../db/h2db/provider}/H2DbServerOptions.java  |   6 +-
 .../db/h2db/provider}/H2DbServiceImpl.java    |  13 +-
 .../db/h2db/provider}/H2DbServiceOptions.java |  26 +-
 .../provider}/H2DbWireRecordStoreImpl.java    |   2 +-
 kura/pom.xml                                  |   1 +
 .../META-INF/MANIFEST.MF                      |  20 --
 .../OSGI-INF/dbservice.xml                    |  37 ---
 .../core/db/test/H2DbServiceImplTest.java     | 211 ------------
 .../META-INF/MANIFEST.MF                      |  20 ++
 .../about.html                                |  36 +++
 .../build.properties                          |  14 +-
 .../pom.xml                                   |  32 +-
 .../provider}/DbDataStoreStorageTest.java     |   6 +-
 .../h2db/provider}/H2DbServiceImplTest.java   |   4 +-
 kura/test/pom.xml                             |  11 +-
 36 files changed, 569 insertions(+), 387 deletions(-)
 create mode 100644 kura/org.eclipse.kura.db.h2db.provider/.gitignore
 create mode 100644 kura/org.eclipse.kura.db.h2db.provider/META-INF/MANIFEST.MF
 rename kura/{org.eclipse.kura.core => org.eclipse.kura.db.h2db.provider}/OSGI-INF/h2db.xml (89%)
 rename kura/{org.eclipse.kura.core => org.eclipse.kura.db.h2db.provider}/OSGI-INF/h2dbhelper.xml (82%)
 rename kura/{org.eclipse.kura.core => org.eclipse.kura.db.h2db.provider}/OSGI-INF/h2dbserver.xml (83%)
 rename kura/{org.eclipse.kura.core => org.eclipse.kura.db.h2db.provider}/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml (96%)
 rename kura/{org.eclipse.kura.core => org.eclipse.kura.db.h2db.provider}/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml (98%)
 rename kura/{test/org.eclipse.kura.core.db.test => org.eclipse.kura.db.h2db.provider}/about.html (100%)
 create mode 100644 kura/org.eclipse.kura.db.h2db.provider/about_files/epl-v20.html
 create mode 100644 kura/org.eclipse.kura.db.h2db.provider/build.properties
 create mode 100644 kura/org.eclipse.kura.db.h2db.provider/pom.xml
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbHelper.java (91%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbMessageStoreImpl.java (98%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbQueryableWireRecordStoreImpl.java (93%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbServer.java (96%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbServerOptions.java (92%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbServiceImpl.java (98%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbServiceOptions.java (97%)
 rename kura/{org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbWireRecordStoreImpl.java (98%)
 delete mode 100644 kura/test/org.eclipse.kura.core.db.test/META-INF/MANIFEST.MF
 delete mode 100644 kura/test/org.eclipse.kura.core.db.test/OSGI-INF/dbservice.xml
 delete mode 100644 kura/test/org.eclipse.kura.core.db.test/src/main/java/org/eclipse/kura/core/db/test/H2DbServiceImplTest.java
 create mode 100644 kura/test/org.eclipse.kura.db.h2db.provider.test/META-INF/MANIFEST.MF
 create mode 100644 kura/test/org.eclipse.kura.db.h2db.provider.test/about.html
 rename kura/test/{org.eclipse.kura.core.db.test => org.eclipse.kura.db.h2db.provider.test}/build.properties (63%)
 rename kura/test/{org.eclipse.kura.core.db.test => org.eclipse.kura.db.h2db.provider.test}/pom.xml (69%)
 rename kura/test/{org.eclipse.kura.core.test/src/test/java/org/eclipse/kura/core/data/store => org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider}/DbDataStoreStorageTest.java (98%)
 rename kura/test/{org.eclipse.kura.core.db.test/src/test/java/org/eclipse/kura/core/db => org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider}/H2DbServiceImplTest.java (98%)

diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
index 416ba1f54cc..d14d414ff52 100644
--- a/kura/distrib/config/kura.build.properties
+++ b/kura/distrib/config/kura.build.properties
@@ -129,6 +129,7 @@ org.eclipse.kura.container.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.configuration.change.manager.version=2.0.0-SNAPSHOT
 org.eclipse.kura.event.publisher.version=2.0.0-SNAPSHOT
 org.eclipse.kura.db.sqlite.provider.version=2.0.0-SNAPSHOT
+org.eclipse.kura.db.h2db.provider.version=1.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
diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
index 49f8430b4c5..3647d2934b0 100644
--- a/kura/distrib/pom.xml
+++ b/kura/distrib/pom.xml
@@ -676,6 +676,11 @@
                                     <artifactId>org.eclipse.kura.rest.network.status.provider</artifactId>
                                     <version>${org.eclipse.kura.rest.network.status.provider.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.kura</groupId>
+                                    <artifactId>org.eclipse.kura.db.h2db.provider</artifactId>
+                                    <version>${org.eclipse.kura.db.h2db.provider.version}</version>
+                                </artifactItem>
                             </artifactItems>
                             <stripVersion>true</stripVersion>
                             <outputDirectory>${project.basedir}/target/plugins</outputDirectory>
@@ -837,6 +842,7 @@
                                 <move file="target/plugins/org.eclipse.kura.configuration.change.manager.jar" tofile="target/plugins/org.eclipse.kura.configuration.change.manager_${org.eclipse.kura.configuration.change.manager.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.event.publisher.jar" tofile="target/plugins/org.eclipse.kura.event.publisher_${org.eclipse.kura.event.publisher.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.rest.network.status.provider.jar" tofile="target/plugins/org.eclipse.kura.rest.network.status.provider_${org.eclipse.kura.rest.network.status.provider.version}.jar" />
+                                <move file="target/plugins/org.eclipse.kura.db.h2db.provider.jar" tofile="target/plugins/org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar" />
                             </target>
                         </configuration>
                     </execution>
@@ -2086,6 +2092,7 @@
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.container.provider_${org.eclipse.kura.container.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.configuration.change.manager_${org.eclipse.kura.configuration.change.manager.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                         <copy file="${project.build.directory}/plugins/org.eclipse.kura.event.publisher_${org.eclipse.kura.event.publisher.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
                                     </target>
                                 </configuration>
                             </execution>
diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 0f0cb7bf181..e8bb1277f17 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -158,6 +158,7 @@
         <antcall target="linux.usb-config" />
         <antcall target="bluetooth-config" />
         <antcall target="linux.watchdog-config" />
+    	<antcall target="h2db-config" />
 
         <!-- Added Camel bundles configs -->
         <antcall target="camel-config" />
@@ -701,6 +702,7 @@ fi]]>
         <antcall target="emulator-gpio-jar" />
         <antcall target="emulator-jars" />
         <antcall target="linux-network-jars" />
+    	<antcall target="h2db-jars" />
 
         <echo message="Building Kura Distribution for ${build.name}-jars..." />
 
@@ -1281,6 +1283,14 @@ fi]]>
         </propertyfile>
     </target>
 
+    <target name="h2db-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.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar@4" />
+        </propertyfile>
+    </target>
+        	
     <target name="asset-jar">
         <zip destfile="${project.build.directory}/${build.output.name}.zip"
             update="true">
@@ -1754,6 +1764,15 @@ fi]]>
             todir="${build.install.dir.kura}/kura/plugins" />
     </target>
 
+    <target name="h2db-jars">
+        <zip destfile="${project.build.directory}/${build.output.name}.zip"
+            update="true">
+            <zipfileset
+                file="${project.build.directory}/plugins/org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar"
+                prefix="${build.output.name}/${plugins.folder}" />
+        </zip>
+    </target>
+    	
     <target name="misc-config">
         <propertyfile
             file="${project.build.directory}/${build.output.name}/config.ini">
diff --git a/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF
index c695117aa8c..3ca36ebae38 100644
--- a/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF
+++ b/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF
@@ -50,16 +50,7 @@ Import-Package: javax.crypto,
  org.eclipse.kura.type;version="[1.1,2.0)",
  org.eclipse.kura.util.configuration;version="[1.0,2.0)",
  org.eclipse.kura.util.jdbc;version="[1.0,2.0)",
- org.eclipse.kura.util.message.store;version="[1.0,1.1)",
- org.eclipse.kura.util.store.listener;version="[1.0,2.0)",
- org.eclipse.kura.util.wire.store;version="[1.0,1.1)",
  org.eclipse.kura.watchdog;version="[1.0,2.0)",
- org.eclipse.kura.wire;version="[2.0,3.0)",
- org.eclipse.kura.wire.store.provider;version="[1.0,1.1)",
- org.h2;version="2.1.214",
- org.h2.api;version="2.1.214",
- org.h2.jdbcx;version="2.1.214",
- org.h2.tools;version="2.1.214",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.component;version="1.2.0",
  org.osgi.service.event;version="1.4.0",
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceImpl.java b/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceImpl.java
index 1254b51c9e9..48615c7aa2c 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceImpl.java
+++ b/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 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
@@ -13,8 +13,6 @@
 package org.eclipse.kura.core.data;
 
 import java.security.SecureRandom;
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -45,7 +43,6 @@
 import org.eclipse.kura.configuration.ConfigurationService;
 import org.eclipse.kura.connection.listener.ConnectionListener;
 import org.eclipse.kura.core.data.store.MessageStoreState;
-import org.eclipse.kura.core.db.H2DbMessageStoreImpl;
 import org.eclipse.kura.core.internal.data.TokenBucket;
 import org.eclipse.kura.data.DataService;
 import org.eclipse.kura.data.DataTransportService;
@@ -59,8 +56,6 @@
 import org.eclipse.kura.status.CloudConnectionStatusComponent;
 import org.eclipse.kura.status.CloudConnectionStatusEnum;
 import org.eclipse.kura.status.CloudConnectionStatusService;
-import org.eclipse.kura.util.jdbc.ConnectionProvider;
-import org.eclipse.kura.util.jdbc.SQLFunction;
 import org.eclipse.kura.watchdog.CriticalComponent;
 import org.eclipse.kura.watchdog.WatchdogService;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -178,8 +173,6 @@ public Object addingService(ServiceReference<Object> reference) {
 
                             if (service instanceof MessageStoreProvider) {
                                 setMessageStoreProvider((MessageStoreProvider) service);
-                            } else if (service instanceof H2DbService) {
-                                setH2DbService((H2DbService) service);
                             } else {
                                 DataServiceImpl.this.componentContext.getBundleContext().ungetService(reference);
                                 return null;
@@ -346,36 +339,6 @@ public synchronized void unsetMessageStoreProvider() {
 
     }
 
-    public synchronized void setH2DbService(H2DbService dbService) {
-        setMessageStoreProvider(new MessageStoreProvider() {
-
-            @SuppressWarnings("restriction")
-            @Override
-            public MessageStore openMessageStore(String name) throws KuraStoreException {
-                return new H2DbMessageStoreImpl(new ConnectionProvider() {
-
-                    @Override
-                    public <T> T withConnection(final SQLFunction<Connection, T> task) throws SQLException {
-                        return dbService.withConnection(task::call);
-                    }
-                }, name);
-            }
-
-            @Override
-            public void addListener(ConnectionListener listener) {
-                // Do nothing
-
-            }
-
-            @Override
-            public void removeListener(ConnectionListener listener) {
-                // Do nothin
-
-            }
-        });
-
-    }
-
     public synchronized void unsetH2DbService(H2DbService dbService) {
         unsetMessageStoreProvider();
     }
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceOptions.java b/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceOptions.java
index e537befc310..8ac114aec2d 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceOptions.java
+++ b/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/data/DataServiceOptions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -12,19 +12,18 @@
  *******************************************************************************/
 package org.eclipse.kura.core.data;
 
-import static java.util.Objects.requireNonNull;
-
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.kura.configuration.ConfigurationService;
-import org.eclipse.kura.db.H2DbService;
 import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.Objects.requireNonNull;
+
 public class DataServiceOptions {
 
     private static final Logger logger = LoggerFactory.getLogger(DataServiceOptions.class);
@@ -55,7 +54,7 @@ public class DataServiceOptions {
     private static final boolean AUTOCONNECT_PROP_DEFAULT = false;
     private static final int CONNECT_DELAY_DEFAULT = 60;
     private static final int DISCONNECT_DELAY_DEFAULT = 10;
-    private static final String DB_SERVICE_INSTANCE_DEFAULT = H2DbService.DEFAULT_INSTANCE_PID;
+    private static final String DB_SERVICE_INSTANCE_DEFAULT = "org.eclipse.kura.db.H2DbService";
     private static final int STORE_HOUSEKEEPER_INTERVAL_DEFAULT = 900;
     private static final int STORE_PURGE_AGE_DEFAULT = 60;
     private static final int STORE_CAPACITY_DEFAULT = 10000;
@@ -181,11 +180,11 @@ public boolean isConnectionScheduleEnabled() {
     }
 
     public Optional<CronExpression> getConnectionScheduleExpression() {
-        
+
         if (!this.isConnectionScheduleEnabled()) {
             return Optional.empty();
         }
-        
+
         try {
             return Optional.of(new CronExpression((String) this.properties.get(CONNECTION_SCHECULE_EXPRESSION)));
         } catch (final Exception e) {
diff --git a/kura/org.eclipse.kura.db.h2db.provider/.gitignore b/kura/org.eclipse.kura.db.h2db.provider/.gitignore
new file mode 100644
index 00000000000..f1ff06d608f
--- /dev/null
+++ b/kura/org.eclipse.kura.db.h2db.provider/.gitignore
@@ -0,0 +1 @@
+lib/
\ No newline at end of file
diff --git a/kura/org.eclipse.kura.db.h2db.provider/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.db.h2db.provider/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b0f46507153
--- /dev/null
+++ b/kura/org.eclipse.kura.db.h2db.provider/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.kura.db.h2db.provider
+Bundle-SymbolicName: org.eclipse.kura.db.h2db.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
+Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.kura;version="[1.7,2.0)",
+ org.eclipse.kura.configuration;version="[1.2,2.0)",
+ org.eclipse.kura.connection.listener;version="1.0.0",
+ org.eclipse.kura.crypto;version="1.3.0",
+ org.eclipse.kura.data;version="[1.1,2.0)",
+ org.eclipse.kura.db;version="[2.0,2.1)",
+ org.eclipse.kura.message.store;version="[1.0,2.0)",
+ org.eclipse.kura.message.store.provider;version="[1.0,1.1)",
+ org.eclipse.kura.type;version="[1.1,2.0)",
+ org.eclipse.kura.util.configuration;version="[1.0,1.1)",
+ org.eclipse.kura.util.jdbc;version="[1.0,2.0)",
+ org.eclipse.kura.util.message.store;version="[1.0,2.0)",
+ org.eclipse.kura.util.store.listener;version="[1.0,2.0)",
+ org.eclipse.kura.util.wire.store;version="[1.0,1.1)",
+ org.eclipse.kura.wire;version="[2.0,3.0)",
+ org.eclipse.kura.wire.store.provider;version="[1.0,1.1)",
+ org.h2;version="2.1.214",
+ org.h2.api;version="2.1.214",
+ org.h2.jdbcx;version="2.1.214",
+ org.h2.tools;version="2.1.214",
+ org.osgi.framework;version="1.10.0",
+ org.osgi.service.component;version="1.4.0",
+ org.slf4j;version="1.7.32"
diff --git a/kura/org.eclipse.kura.core/OSGI-INF/h2db.xml b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2db.xml
similarity index 89%
rename from kura/org.eclipse.kura.core/OSGI-INF/h2db.xml
rename to kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2db.xml
index c2201a80959..b39c948a6f3 100644
--- a/kura/org.eclipse.kura.core/OSGI-INF/h2db.xml
+++ b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2db.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2017, 2023 Eurotech and/or its affiliates and others
+   Copyright (c) 2017, 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
@@ -14,7 +14,7 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" activate="activate" configuration-policy="require" deactivate="deactivate" modified="updated" name="org.eclipse.kura.core.db.H2DbService">
-   <implementation class="org.eclipse.kura.core.db.H2DbServiceImpl"/>
+   <implementation class="org.eclipse.kura.internal.db.h2db.provider.H2DbServiceImpl"/>
    <service>
       <provide interface="org.eclipse.kura.configuration.ConfigurableComponent"/>
       <provide interface="org.eclipse.kura.db.BaseDbService"/>
diff --git a/kura/org.eclipse.kura.core/OSGI-INF/h2dbhelper.xml b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbhelper.xml
similarity index 82%
rename from kura/org.eclipse.kura.core/OSGI-INF/h2dbhelper.xml
rename to kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbhelper.xml
index 68ebc833550..3dd0ececafe 100644
--- a/kura/org.eclipse.kura.core/OSGI-INF/h2dbhelper.xml
+++ b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbhelper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+   Copyright (c) 2017, 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
@@ -14,6 +14,6 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" immediate="true" name="org.eclipse.kura.core.db.H2DbHelper">
-   <implementation class="org.eclipse.kura.core.db.H2DbHelper"/>
+   <implementation class="org.eclipse.kura.internal.db.h2db.provider.H2DbHelper"/>
    <reference bind="setConfigurationService" cardinality="1..1" interface="org.eclipse.kura.configuration.ConfigurationService" name="ConfigurationService" policy="static" unbind="unsetConfigurationService"/>
 </scr:component>
diff --git a/kura/org.eclipse.kura.core/OSGI-INF/h2dbserver.xml b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbserver.xml
similarity index 83%
rename from kura/org.eclipse.kura.core/OSGI-INF/h2dbserver.xml
rename to kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbserver.xml
index 8a50be4901f..1da2284f41d 100644
--- a/kura/org.eclipse.kura.core/OSGI-INF/h2dbserver.xml
+++ b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/h2dbserver.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+   Copyright (c) 2017, 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
@@ -14,7 +14,7 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" configuration-policy="require" deactivate="deactivate" immediate="true" modified="updated" name="org.eclipse.kura.core.db.H2DbServer">
-   <implementation class="org.eclipse.kura.core.db.H2DbServer"/>
+   <implementation class="org.eclipse.kura.internal.db.h2db.provider.H2DbServer"/>
    <property name="service.pid" type="String" value="org.eclipse.kura.core.db.H2DbServer"/>
    <service>
       <provide interface="org.eclipse.kura.configuration.ConfigurableComponent"/>
diff --git a/kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml
similarity index 96%
rename from kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml
rename to kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml
index d0b58c00b5b..4276f395310 100644
--- a/kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml
+++ b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbServer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+    Copyright (c) 2017, 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
diff --git a/kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml
similarity index 98%
rename from kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml
rename to kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml
index 3e522a4fd1e..28a4b5f6db9 100644
--- a/kura/org.eclipse.kura.core/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml
+++ b/kura/org.eclipse.kura.db.h2db.provider/OSGI-INF/metatype/org.eclipse.kura.core.db.H2DbService.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+    Copyright (c) 2017, 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
diff --git a/kura/test/org.eclipse.kura.core.db.test/about.html b/kura/org.eclipse.kura.db.h2db.provider/about.html
similarity index 100%
rename from kura/test/org.eclipse.kura.core.db.test/about.html
rename to kura/org.eclipse.kura.db.h2db.provider/about.html
diff --git a/kura/org.eclipse.kura.db.h2db.provider/about_files/epl-v20.html b/kura/org.eclipse.kura.db.h2db.provider/about_files/epl-v20.html
new file mode 100644
index 00000000000..cc699dea65b
--- /dev/null
+++ b/kura/org.eclipse.kura.db.h2db.provider/about_files/epl-v20.html
@@ -0,0 +1,301 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Eclipse Public License - Version 2.0</title>
+  <style type="text/css">
+    body {
+      margin: 1.5em 3em;
+    }
+    h1{
+      font-size:1.5em;
+    }
+    h2{
+      font-size:1em;
+      margin-bottom:0.5em;
+      margin-top:1em;
+    }
+    p {
+      margin-top:  0.5em;
+      margin-bottom: 0.5em;
+    }
+    ul, ol{
+      list-style-type:none;
+    }
+  </style>
+</head>
+<body>
+<h1>Eclipse Public License - v 2.0</h1>
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+  PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+  OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+</p>
+<h2 id="definitions">1. DEFINITIONS</h2>
+<p>&ldquo;Contribution&rdquo; means:</p>
+<ul>
+  <li>a) in the case of the initial Contributor, the initial content
+    Distributed under this Agreement, and
+  </li>
+  <li>
+    b) in the case of each subsequent Contributor:
+    <ul>
+      <li>i) changes to the Program, and</li>
+      <li>ii) additions to the Program;</li>
+    </ul>
+    where such changes and/or additions to the Program originate from
+    and are Distributed by that particular Contributor. A Contribution
+    &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+    Contributor itself or anyone acting on such Contributor&#039;s behalf.
+    Contributions do not include changes or additions to the Program that
+    are not Modified Works.
+  </li>
+</ul>
+<p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+<p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+  are necessarily infringed by the use or sale of its Contribution alone
+  or when combined with the Program.
+</p>
+<p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+  Agreement.
+</p>
+<p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+  or any Secondary License (as applicable), including Contributors.
+</p>
+<p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+  form, that is based on (or derived from) the Program and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship.
+</p>
+<p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+  results from an addition to, deletion from, or modification of the
+  contents of the Program, including, for purposes of clarity any new file
+  in Source Code form that contains any contents of the Program. Modified
+  Works shall not include works that contain only declarations, interfaces,
+  types, classes, structures, or files of the Program solely in each case
+  in order to link to, bind by name, or subclass the Program or Modified
+  Works thereof.
+</p>
+<p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+  in any manner that enables the transfer of a copy.
+</p>
+<p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.
+</p>
+<p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+  Version 2.0, or any later versions of that license, including any
+  exceptions or additional permissions as identified by the initial
+  Contributor.
+</p>
+<h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+<ul>
+  <li>a) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free copyright
+    license to reproduce, prepare Derivative Works of, publicly display,
+    publicly perform, Distribute and sublicense the Contribution of such
+    Contributor, if any, and such Derivative Works.
+  </li>
+  <li>b) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free patent
+    license under Licensed Patents to make, use, sell, offer to sell,
+    import and otherwise transfer the Contribution of such Contributor,
+    if any, in Source Code or other form. This patent license shall
+    apply to the combination of the Contribution and the Program if,
+    at the time the Contribution is added by the Contributor, such
+    addition of the Contribution causes such combination to be covered
+    by the Licensed Patents. The patent license shall not apply to any
+    other combinations which include the Contribution. No hardware per
+    se is licensed hereunder.
+  </li>
+  <li>c) Recipient understands that although each Contributor grants the
+    licenses to its Contributions set forth herein, no assurances are
+    provided by any Contributor that the Program does not infringe the
+    patent or other intellectual property rights of any other entity.
+    Each Contributor disclaims any liability to Recipient for claims
+    brought by any other entity based on infringement of intellectual
+    property rights or otherwise. As a condition to exercising the rights
+    and licenses granted hereunder, each Recipient hereby assumes sole
+    responsibility to secure any other intellectual property rights needed,
+    if any. For example, if a third party patent license is required to
+    allow Recipient to Distribute the Program, it is Recipient&#039;s
+    responsibility to acquire that license before distributing the Program.
+  </li>
+  <li>d) Each Contributor represents that to its knowledge it has sufficient
+    copyright rights in its Contribution, if any, to grant the copyright
+    license set forth in this Agreement.
+  </li>
+  <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+    makes additional grants to any Recipient (other than those set forth
+    in this Agreement) as a result of such Recipient&#039;s receipt of the
+    Program under the terms of a Secondary License (if permitted under
+    the terms of Section 3).
+  </li>
+</ul>
+<h2 id="requirements">3. REQUIREMENTS</h2>
+<p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+<ul>
+  <li>a) the Program must also be made available as Source Code, in
+    accordance with section 3.2, and the Contributor must accompany
+    the Program with a statement that the Source Code for the Program
+    is available under this Agreement, and informs Recipients how to
+    obtain it in a reasonable manner on or through a medium customarily
+    used for software exchange; and
+  </li>
+  <li>
+    b) the Contributor may Distribute the Program under a license
+    different than this Agreement, provided that such license:
+    <ul>
+      <li>i) effectively disclaims on behalf of all other Contributors all
+        warranties and conditions, express and implied, including warranties
+        or conditions of title and non-infringement, and implied warranties
+        or conditions of merchantability and fitness for a particular purpose;
+      </li>
+      <li>ii) effectively excludes on behalf of all other Contributors all
+        liability for damages, including direct, indirect, special, incidental
+        and consequential damages, such as lost profits;
+      </li>
+      <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+        Source Code under section 3.2; and
+      </li>
+      <li>iv) requires any subsequent distribution of the Program by any party
+        to be under a license that satisfies the requirements of this section 3.
+      </li>
+    </ul>
+  </li>
+</ul>
+<p>3.2 When the Program is Distributed as Source Code:</p>
+<ul>
+  <li>a) it must be made available under this Agreement, or if the Program (i)
+    is combined with other material in a separate file or files made available
+    under a Secondary License, and (ii) the initial Contributor attached to
+    the Source Code the notice described in Exhibit A of this Agreement,
+    then the Program may be made available under the terms of such
+    Secondary Licenses, and
+  </li>
+  <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+</ul>
+<p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+  attribution notices, disclaimers of warranty, or limitations of liability
+  (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+  they Distribute, provided that Contributors may add their own appropriate
+  notices.
+</p>
+<h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+<p>Commercial distributors of software may accept certain responsibilities
+  with respect to end users, business partners and the like. While this
+  license is intended to facilitate the commercial use of the Program, the
+  Contributor who includes the Program in a commercial product offering should
+  do so in a manner which does not create potential liability for other
+  Contributors. Therefore, if a Contributor includes the Program in a
+  commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+  hereby agrees to defend and indemnify every other Contributor
+  (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+  (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+  brought by a third party against the Indemnified Contributor to the extent
+  caused by the acts or omissions of such Commercial Contributor in connection
+  with its distribution of the Program in a commercial product offering.
+  The obligations in this section do not apply to any claims or Losses relating
+  to any actual or alleged intellectual property infringement. In order to
+  qualify, an Indemnified Contributor must: a) promptly notify the
+  Commercial Contributor in writing of such claim, and b) allow the Commercial
+  Contributor to control, and cooperate with the Commercial Contributor in,
+  the defense and any related settlement negotiations. The Indemnified
+  Contributor may participate in any such claim at its own expense.
+</p>
+<p>For example, a Contributor might include the Program
+  in a commercial product offering, Product X. That Contributor is then a
+  Commercial Contributor. If that Commercial Contributor then makes performance
+  claims, or offers warranties related to Product X, those performance claims
+  and warranties are such Commercial Contributor&#039;s responsibility alone.
+  Under this section, the Commercial Contributor would have to defend claims
+  against the other Contributors related to those performance claims and
+  warranties, and if a court requires any other Contributor to pay any damages
+  as a result, the Commercial Contributor must pay those damages.
+</p>
+<h2 id="warranty">5. NO WARRANTY</h2>
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+  BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+  WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+  WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+  solely responsible for determining the appropriateness of using and
+  distributing the Program and assumes all risks associated with its
+  exercise of rights under this Agreement, including but not limited to the
+  risks and costs of program errors, compliance with applicable laws, damage
+  to or loss of data, programs or equipment, and unavailability or
+  interruption of operations.
+</p>
+<h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+  BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+  LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+  OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+</p>
+<h2 id="general">7. GENERAL</h2>
+<p>If any provision of this Agreement is invalid or unenforceable under
+  applicable law, it shall not affect the validity or enforceability of the
+  remainder of the terms of this Agreement, and without further action by the
+  parties hereto, such provision shall be reformed to the minimum extent
+  necessary to make such provision valid and enforceable.
+</p>
+<p>If Recipient institutes patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+  (excluding combinations of the Program with other software or hardware)
+  infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+  under Section 2(b) shall terminate as of the date such litigation is filed.
+</p>
+<p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+  comply with any of the material terms or conditions of this Agreement and
+  does not cure such failure in a reasonable period of time after becoming
+  aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+  terminate, Recipient agrees to cease use and distribution of the Program
+  as soon as reasonably practicable. However, Recipient&#039;s obligations under
+  this Agreement and any licenses granted by Recipient relating to the
+  Program shall continue and survive.
+</p>
+<p>Everyone is permitted to copy and distribute copies of this Agreement,
+  but in order to avoid inconsistency the Agreement is copyrighted and may
+  only be modified in the following manner. The Agreement Steward reserves
+  the right to publish new versions (including revisions) of this Agreement
+  from time to time. No one other than the Agreement Steward has the right
+  to modify this Agreement. The Eclipse Foundation is the initial Agreement
+  Steward. The Eclipse Foundation may assign the responsibility to serve as
+  the Agreement Steward to a suitable separate entity. Each new version of
+  the Agreement will be given a distinguishing version number. The Program
+  (including Contributions) may always be Distributed subject to the version
+  of the Agreement under which it was received. In addition, after a new
+  version of the Agreement is published, Contributor may elect to Distribute
+  the Program (including its Contributions) under the new version.
+</p>
+<p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+  receives no rights or licenses to the intellectual property of any
+  Contributor under this Agreement, whether expressly, by implication,
+  estoppel or otherwise. All rights in the Program not expressly granted
+  under this Agreement are reserved. Nothing in this Agreement is intended
+  to be enforceable by any entity that is not a Contributor or Recipient.
+  No third-party beneficiary rights are created under this Agreement.
+</p>
+<h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+<p>&ldquo;This Source Code may also be made available under the following
+  Secondary Licenses when the conditions for such availability set forth
+  in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+  version(s), and exceptions or additional permissions here}.&rdquo;
+</p>
+<blockquote>
+  <p>Simply including a copy of this Agreement, including this Exhibit A
+    is not sufficient to license the Source Code under Secondary Licenses.
+  </p>
+  <p>If it is not possible or desirable to put the notice in a particular file,
+    then You may include the notice in a location (such as a LICENSE file in a
+    relevant directory) where a recipient would be likely to look for
+    such a notice.
+  </p>
+  <p>You may add additional accurate notices of copyright ownership.</p>
+</blockquote>
+</body>
+</html>
\ No newline at end of file
diff --git a/kura/org.eclipse.kura.db.h2db.provider/build.properties b/kura/org.eclipse.kura.db.h2db.provider/build.properties
new file mode 100644
index 00000000000..057c0b16139
--- /dev/null
+++ b/kura/org.eclipse.kura.db.h2db.provider/build.properties
@@ -0,0 +1,23 @@
+#
+#  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
+#  which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+#  SPDX-License-Identifier: EPL-2.0
+#
+#  Contributors:
+#   Eurotech
+#
+
+source.. = src/main/java/
+output..  = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about_files/,\
+               about.html
+src.includes = about.html,\
+               about_files/
+
diff --git a/kura/org.eclipse.kura.db.h2db.provider/pom.xml b/kura/org.eclipse.kura.db.h2db.provider/pom.xml
new file mode 100644
index 00000000000..6a8f5a18e6b
--- /dev/null
+++ b/kura/org.eclipse.kura.db.h2db.provider/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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
+    which is available at https://www.eclipse.org/legal/epl-2.0/
+ 
+	SPDX-License-Identifier: EPL-2.0
+	
+	Contributors:
+	 Eurotech
+
+-->
+<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.eclipse.kura</groupId>
+		<artifactId>kura</artifactId>
+		<version>6.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.kura.db.h2db.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/*/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+	</properties>
+
+</project>
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbHelper.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbHelper.java
similarity index 91%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbHelper.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbHelper.java
index 815f29d4288..8df309e72e2 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbHelper.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import org.eclipse.kura.KuraException;
 import org.eclipse.kura.configuration.ConfigurationService;
@@ -31,7 +31,9 @@ protected void setConfigurationService(ConfigurationService configurationService
     }
 
     protected void unsetConfigurationService(ConfigurationService configurationService) {
-        this.configurationService = null;
+        if (this.configurationService.equals(configurationService)) {
+            this.configurationService = null;
+        }
     }
 
     private void startDefaultDbServiceInstance() {
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbMessageStoreImpl.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbMessageStoreImpl.java
similarity index 98%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbMessageStoreImpl.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbMessageStoreImpl.java
index 1567ab056c0..b74c01852a4 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbMessageStoreImpl.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbMessageStoreImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2023, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  ******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.io.ByteArrayInputStream;
 import java.sql.PreparedStatement;
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbQueryableWireRecordStoreImpl.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbQueryableWireRecordStoreImpl.java
similarity index 93%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbQueryableWireRecordStoreImpl.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbQueryableWireRecordStoreImpl.java
index 544889512c3..fa6162def26 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbQueryableWireRecordStoreImpl.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbQueryableWireRecordStoreImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2023, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  ******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import static java.util.Objects.isNull;
 
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServer.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServer.java
similarity index 96%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServer.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServer.java
index f990f802029..8a3cb8457ff 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServer.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.sql.SQLException;
 import java.util.Map;
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServerOptions.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServerOptions.java
similarity index 92%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServerOptions.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServerOptions.java
index decc1bb9092..07ea0874773 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServerOptions.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServerOptions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,11 +10,11 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.util.Map;
 
-import org.eclipse.kura.core.db.H2DbServer.ServerType;
+import org.eclipse.kura.internal.db.h2db.provider.H2DbServer.ServerType;
 
 class H2DbServerOptions {
 
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceImpl.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImpl.java
similarity index 98%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceImpl.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImpl.java
index ddcdcb0d53f..506e3d85d01 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceImpl.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -114,7 +114,9 @@ public void setCryptoService(CryptoService cryptoService) {
     }
 
     public void unsetCryptoService(CryptoService cryptoService) {
-        this.cryptoService = null;
+        if (this.cryptoService.equals(cryptoService)) {
+            this.cryptoService = null;
+        }
     }
 
     // ----------------------------------------------------------------
@@ -402,8 +404,11 @@ private void syncWithExecutor() {
         try {
             this.executor.submit(() -> {
             }).get();
-        } catch (final Exception e) {
+        } catch (final InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new IllegalStateException(e);
+        } catch (final Exception e1) {
+            throw new IllegalStateException(e1);
         }
     }
 
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceOptions.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceOptions.java
similarity index 97%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceOptions.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceOptions.java
index 199985ae42d..e033f86cefa 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbServiceOptions.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceOptions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.io.File;
 import java.util.Map;
@@ -106,15 +106,7 @@ private void computeUrlParts() {
             }
         }
 
-        if ("mem".equals(protocol)) {
-            this.isInMemory = true;
-        } else if ("file".equals(protocol)) {
-            this.isFileBased = true;
-        } else if ("zip".equals(protocol)) {
-            this.isZipBased = true;
-        } else {
-            this.isRemote = true;
-        }
+        parseProtocol(protocol);
 
         this.baseUrl = "jdbc:h2:" + protocol + ':' + url;
 
@@ -130,6 +122,18 @@ private void computeUrlParts() {
         this.isFileBasedLogLevelSpecified = FILE_LOG_LEVEL_PATTERN.matcher(this.dbUrl).find();
     }
 
+    private void parseProtocol(String protocol) {
+        if ("mem".equals(protocol)) {
+            this.isInMemory = true;
+        } else if ("file".equals(protocol)) {
+            this.isFileBased = true;
+        } else if ("zip".equals(protocol)) {
+            this.isZipBased = true;
+        } else {
+            this.isRemote = true;
+        }
+    }
+
     public String getDbUrl() {
         return this.dbUrl;
     }
diff --git a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbWireRecordStoreImpl.java b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbWireRecordStoreImpl.java
similarity index 98%
rename from kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbWireRecordStoreImpl.java
rename to kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbWireRecordStoreImpl.java
index 27ee9ce381a..c3d70a1d1bd 100644
--- a/kura/org.eclipse.kura.core/src/main/java/org/eclipse/kura/core/db/H2DbWireRecordStoreImpl.java
+++ b/kura/org.eclipse.kura.db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbWireRecordStoreImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  ******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/kura/pom.xml b/kura/pom.xml
index 29ec71c900e..eabdc6aabe3 100644
--- a/kura/pom.xml
+++ b/kura/pom.xml
@@ -125,6 +125,7 @@
         <module>org.eclipse.kura.configuration.change.manager</module>
         <module>org.eclipse.kura.wire.script.tools</module>
         <module>org.eclipse.kura.db.sqlite.provider</module>
+        <module>org.eclipse.kura.db.h2db.provider</module>
         <module>org.eclipse.kura.rest.network.status.provider</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider</module>
         <module>emulator</module>
diff --git a/kura/test/org.eclipse.kura.core.db.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.core.db.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 8fb43a95339..00000000000
--- a/kura/test/org.eclipse.kura.core.db.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.kura.core.db.test
-Bundle-SymbolicName: org.eclipse.kura.core.db.test;singleton:=true
-Bundle-Version: 6.0.0.qualifier
-Bundle-Vendor: Eclipse Kura
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Fragment-Host: org.eclipse.kura.core
-Import-Package: org.eclipse.kura;version="[1.2,2.0)",
- org.eclipse.kura.core.testutil,
- org.eclipse.kura.db;version="[2.0,3.0)",
- org.h2;version="2.1.214",
- org.h2.jdbc;version="2.1.214",
- org.junit;version="[4.12.0,5.0.0)",
- org.junit.runner;version="[4.12.0,5.0.0)",
- org.junit.runners;version="[4.12.0,5.0.0)",
- org.mockito;version="[4.0.0,5.0.0)",
- org.mockito.invocation;version="[4.0.0,5.0.0)",
- org.mockito.stubbing;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
diff --git a/kura/test/org.eclipse.kura.core.db.test/OSGI-INF/dbservice.xml b/kura/test/org.eclipse.kura.core.db.test/OSGI-INF/dbservice.xml
deleted file mode 100644
index 8e7c1b68c13..00000000000
--- a/kura/test/org.eclipse.kura.core.db.test/OSGI-INF/dbservice.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  Copyright (c) 2017, 2020 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
-  which is available at https://www.eclipse.org/legal/epl-2.0/
- 
-	SPDX-License-Identifier: EPL-2.0
-	
-	Contributors:
-	 Eurotech
-
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="H2DbServiceImplTest">
-   <implementation class="org.eclipse.kura.core.db.test.H2DbServiceImplTest" />
-   <reference name="H2DbService"
-              policy="static"
-              cardinality="1..1"
-              bind="bindDbSvc"
-              unbind="unbindDbSvc"
-              interface="org.eclipse.kura.db.H2DbService" />
-   <reference name="ConfigurationService"
-              policy="static"
-              cardinality="1..1"
-              bind="bindCfgSvc"
-              unbind="unbindCfgSvc"
-              interface="org.eclipse.kura.configuration.ConfigurationService" />
-   <reference name="CryptoService"
-              policy="static"
-              cardinality="1..1"
-              bind="bindCryptoSvc"
-              unbind="unbindCryptoSvc"
-              interface="org.eclipse.kura.crypto.CryptoService" />
-
-</scr:component>
\ No newline at end of file
diff --git a/kura/test/org.eclipse.kura.core.db.test/src/main/java/org/eclipse/kura/core/db/test/H2DbServiceImplTest.java b/kura/test/org.eclipse.kura.core.db.test/src/main/java/org/eclipse/kura/core/db/test/H2DbServiceImplTest.java
deleted file mode 100644
index 211f78a0666..00000000000
--- a/kura/test/org.eclipse.kura.core.db.test/src/main/java/org/eclipse/kura/core/db/test/H2DbServiceImplTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017, 2020 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
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *  Eurotech
- ******************************************************************************/
-package org.eclipse.kura.core.db.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.kura.KuraException;
-import org.eclipse.kura.configuration.ComponentConfiguration;
-import org.eclipse.kura.configuration.ConfigurationService;
-import org.eclipse.kura.crypto.CryptoService;
-import org.eclipse.kura.db.H2DbService;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class H2DbServiceImplTest {
-
-    private static ConfigurationService cfgService;
-    private static H2DbService dbService;
-    private static CryptoService cryptoService;
-    private static CountDownLatch dependencyLatch = new CountDownLatch(3);	// initialize with number of dependencies
-
-    private static final String PID = "org.eclipse.kura.db.H2DbService";
-
-    @BeforeClass
-    public static void setUp() throws SQLException, ClassNotFoundException {
-        Class.forName("org.h2.Driver");
-
-        // Wait for OSGi dependencies
-        try {
-            boolean ok = dependencyLatch.await(10, TimeUnit.SECONDS);
-            assertTrue(ok);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            fail("OSGi dependencies unfulfilled");
-        }
-    }
-
-    @Before
-    public void init() throws KuraException {
-        // reset the url and password
-
-        ComponentConfiguration componentConfiguration = cfgService.getComponentConfiguration(PID);
-
-        Map<String, Object> properties = componentConfiguration.getConfigurationProperties();
-        properties.put("db.password", "");
-        properties.put("db.connector.url", "jdbc:h2:mem:kuradb");
-
-        cfgService.updateConfiguration(PID, properties);
-    }
-
-    protected void bindCfgSvc(ConfigurationService cfgSvc) {
-        cfgService = cfgSvc;
-        dependencyLatch.countDown();
-    }
-
-    protected void unbindCfgSvc(ConfigurationService cfgSvc) {
-        cfgService = null;
-    }
-
-    protected void bindCryptoSvc(CryptoService cSvc) {
-        cryptoService = cSvc;
-        dependencyLatch.countDown();
-    }
-
-    protected void unbindCryptoSvc(CryptoService cSvc) {
-        cryptoService = null;
-    }
-
-    protected void bindDbSvc(H2DbService dbSvc) {
-        dbService = dbSvc;
-        dependencyLatch.countDown();
-    }
-
-    protected void unbindDbSvc(H2DbService dbSvc) {
-        dbService = null;
-    }
-
-    @Test
-    public void testSvcs() {
-        assertNotNull(cfgService);
-        assertNotNull(cryptoService);
-        assertNotNull(dbService);
-    }
-
-    @Test
-    public void testPasswordUpdate() throws Exception {
-        // connect to DB, update password and check that connection only succeeds with the new password
-
-        final String url = "jdbc:h2:mem:kuradb";
-        final String user = "SA";
-        String pass = "";
-        String newPass = "newPass";
-
-        Connection conn = null;
-        try {
-            conn = DriverManager.getConnection(url, user, pass);
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            pass = newPass;
-            newPass = "";
-
-            conn = DriverManager.getConnection(url, user, pass);
-        }
-
-        assertNotNull(conn);
-
-        verifyUserAndClose(user, conn);
-
-        char[] encPass = cryptoService.encryptAes(newPass.toCharArray());
-
-        String pid = "org.eclipse.kura.db.H2DbService";
-
-        ComponentConfiguration componentConfiguration = cfgService.getComponentConfiguration(pid);
-        Map<String, Object> properties = componentConfiguration.getConfigurationProperties();
-        properties.put("db.password", new String(encPass));
-
-        cfgService.updateConfiguration(pid, properties);
-
-        try {
-            Thread.sleep(100); // wait a bit, just in case
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-
-        conn = null;
-        try {
-            conn = DriverManager.getConnection(url, user, pass);
-            fail("Exception expected - password was changed.");
-        } catch (Exception e) {
-            conn = DriverManager.getConnection(url, user, newPass);
-        }
-
-        assertNotNull(conn);
-
-        verifyUserAndClose(user, conn);
-    }
-
-    private void verifyUserAndClose(final String user, Connection conn) throws SQLException {
-        try (PreparedStatement statement = conn.prepareStatement("SELECT USER()");
-                ResultSet rs = statement.executeQuery();) {
-
-            rs.next();
-            String result = rs.getString(1);
-
-            assertEquals(user, result);
-
-            conn.close();
-        }
-    }
-
-    @Test
-    public void testUrlUpdate() throws Exception {
-        // connect to DB, update url to file protocol and check that connection succeeds with the new url
-
-        final String url = "jdbc:h2:mem:kuradb";
-        File f = new File("/tmp/kuradb");
-        final String newUrl = "jdbc:h2:file:" + f.getAbsolutePath(); // on windows /tmp/kuradb is not absolute!
-        final String user = "SA";
-        String pass = "";
-
-        Connection conn = null;
-        conn = DriverManager.getConnection(url, user, pass);
-        assertNotNull(conn);
-
-        verifyUserAndClose(user, conn);
-
-        ComponentConfiguration componentConfiguration = cfgService.getComponentConfiguration(PID);
-        Map<String, Object> properties = componentConfiguration.getConfigurationProperties();
-        properties.put("db.connector.url", newUrl);
-
-        cfgService.updateConfiguration(PID, properties);
-
-        try {
-            Thread.sleep(100); // wait a bit, just in case
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-
-        conn = DriverManager.getConnection(newUrl, user, pass);
-
-        assertNotNull(conn);
-
-        verifyUserAndClose(user, conn);
-    }
-
-}
diff --git a/kura/test/org.eclipse.kura.db.h2db.provider.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.db.h2db.provider.test/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f1697fc15f1
--- /dev/null
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.kura.db.h2db.provider.test
+Bundle-SymbolicName: org.eclipse.kura.db.h2db.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))"
+Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
+Import-Package: org.apache.felix.service.command;version="1.0.0",
+ org.eclipse.kura;version="[1.7,2.0)",
+ org.eclipse.kura.configuration;version="[1.2,2.0)",
+ org.eclipse.kura.core.testutil.service;version="[1.0,2.0)",
+ org.eclipse.kura.db;version="2.0.0",
+ org.junit;version="4.12.0",
+ org.mockito;version="4.8.1",
+ org.mockito.invocation;version="4.8.1",
+ org.mockito.stubbing;version="4.8.1",
+ org.osgi.framework;version="1.10.0"
+Fragment-Host: org.eclipse.kura.db.h2db.provider
diff --git a/kura/test/org.eclipse.kura.db.h2db.provider.test/about.html b/kura/test/org.eclipse.kura.db.h2db.provider.test/about.html
new file mode 100644
index 00000000000..ec5809fefb9
--- /dev/null
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>November 30, 2017</p>
+<h3>License</h3>
+
+<p>
+    The Eclipse Foundation makes available all content in this plug-in
+    (&quot;Content&quot;). Unless otherwise indicated below, the Content
+    is provided to you under the terms and conditions of the Eclipse
+    Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+    available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+    For purposes of the EPL, &quot;Program&quot; will mean the Content.
+</p>
+
+<p>
+    If you did not receive this Content directly from the Eclipse
+    Foundation, the Content is being redistributed by another party
+    (&quot;Redistributor&quot;) and different terms and conditions may
+    apply to your use of any object code in the Content. Check the
+    Redistributor's license that was provided with the Content. If no such
+    license exists, contact the Redistributor. Unless otherwise indicated
+    below, the terms and conditions of the EPL still apply to any source
+    code in the Content and such source code may be obtained at <a
+        href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/kura/test/org.eclipse.kura.core.db.test/build.properties b/kura/test/org.eclipse.kura.db.h2db.provider.test/build.properties
similarity index 63%
rename from kura/test/org.eclipse.kura.core.db.test/build.properties
rename to kura/test/org.eclipse.kura.db.h2db.provider.test/build.properties
index b13e14aead5..d229c553982 100644
--- a/kura/test/org.eclipse.kura.core.db.test/build.properties
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+# Copyright (c) 2022 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
@@ -10,11 +10,11 @@
 # Contributors:
 #  Eurotech
 #
-output.. = target/classes/
-source.. = src/main/java/
-bin.includes = META-INF/,\
-               .,\
+
+bin.includes = .,\
+               META-INF/,\
                about.html
-additional.bundles = slf4j.api,\
-                     org.junit,\
+source.. = src/main/java/
+additional.bundles = org.eclipse.kura.api,\
+                     slf4j.api,\
                      org.apache.logging.log4j.api
diff --git a/kura/test/org.eclipse.kura.core.db.test/pom.xml b/kura/test/org.eclipse.kura.db.h2db.provider.test/pom.xml
similarity index 69%
rename from kura/test/org.eclipse.kura.core.db.test/pom.xml
rename to kura/test/org.eclipse.kura.db.h2db.provider.test/pom.xml
index b6e62b36a63..8f52ac799b9 100644
--- a/kura/test/org.eclipse.kura.core.db.test/pom.xml
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 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
@@ -14,23 +14,23 @@
 
 -->
 <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>
+	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.eclipse.kura</groupId>
-        <artifactId>test</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>org.eclipse.kura.core.db.test</artifactId>
-    <packaging>eclipse-test-plugin</packaging>
-
-    <properties>
-        <kura.basedir>${project.basedir}/../..</kura.basedir>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
+	<parent>
+		<groupId>org.eclipse.kura</groupId>
+		<artifactId>test</artifactId>
+		<version>6.0.0-SNAPSHOT</version>
+	</parent>
 
+	<artifactId>org.eclipse.kura.db.h2db.provider.test</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+	
+	<properties>
+		<kura.basedir>${project.basedir}/../..</kura.basedir>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+	</properties>
+    
     <build>
         <plugins>
 			<plugin>
diff --git a/kura/test/org.eclipse.kura.core.test/src/test/java/org/eclipse/kura/core/data/store/DbDataStoreStorageTest.java b/kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/DbDataStoreStorageTest.java
similarity index 98%
rename from kura/test/org.eclipse.kura.core.test/src/test/java/org/eclipse/kura/core/data/store/DbDataStoreStorageTest.java
rename to kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/DbDataStoreStorageTest.java
index d03ae4a5805..ca4b0be28d5 100644
--- a/kura/test/org.eclipse.kura.core.test/src/test/java/org/eclipse/kura/core/data/store/DbDataStoreStorageTest.java
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/DbDataStoreStorageTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 Eurotech and/or its affiliates and others
+ * Copyright (c) 2022, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  ******************************************************************************/
-package org.eclipse.kura.core.data.store;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,8 +27,8 @@
 import java.util.Arrays;
 
 import org.eclipse.kura.KuraStoreException;
-import org.eclipse.kura.core.db.H2DbMessageStoreImpl;
 import org.eclipse.kura.db.H2DbService;
+import org.eclipse.kura.db.H2DbService.ConnectionCallable;
 import org.eclipse.kura.message.store.StoredMessage;
 import org.eclipse.kura.message.store.provider.MessageStore;
 import org.eclipse.kura.util.jdbc.ConnectionProvider;
diff --git a/kura/test/org.eclipse.kura.core.db.test/src/test/java/org/eclipse/kura/core/db/H2DbServiceImplTest.java b/kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImplTest.java
similarity index 98%
rename from kura/test/org.eclipse.kura.core.db.test/src/test/java/org/eclipse/kura/core/db/H2DbServiceImplTest.java
rename to kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImplTest.java
index 6cd6de29093..6bf6e903cba 100644
--- a/kura/test/org.eclipse.kura.core.db.test/src/test/java/org/eclipse/kura/core/db/H2DbServiceImplTest.java
+++ b/kura/test/org.eclipse.kura.db.h2db.provider.test/src/test/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImplTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  ******************************************************************************/
-package org.eclipse.kura.core.db;
+package org.eclipse.kura.internal.db.h2db.provider;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/kura/test/pom.xml b/kura/test/pom.xml
index a14f6b60edb..2a88a5bacce 100644
--- a/kura/test/pom.xml
+++ b/kura/test/pom.xml
@@ -281,6 +281,10 @@
                                 <type>p2-installable-unit</type>
                                 <artifactId>org.apache.logging.log4j.core</artifactId>
                             </dependency>
+                            <dependency>
+                                <type>p2-installable-unit</type>
+                                <artifactId>org.eclipse.kura.db.h2db.provider</artifactId>
+                            </dependency>
                         </dependencies>
                         <bundleStartLevel>
                             <bundle>
@@ -840,6 +844,11 @@
                                     <id>org.eclipse.kura.emulator.position</id>
                                     <versionRange>0.0.0</versionRange>
                                 </requirement>
+                                <requirement>
+                                    <type>eclipse-plugin</type>
+                                    <id>org.eclipse.kura.db.h2db.provider</id>
+                                    <versionRange>0.0.0</versionRange>
+                                </requirement>
                             </extraRequirements>
                         </dependency-resolution>
                     </configuration>
@@ -881,7 +890,6 @@
         <module>org.eclipse.kura.core.cloud.test</module>
         <module>org.eclipse.kura.core.cloud.factory.test</module>
         <module>org.eclipse.kura.core.crypto.test</module>
-        <module>org.eclipse.kura.core.db.test</module>
         <module>org.eclipse.kura.core.deployment.test</module>
         <module>org.eclipse.kura.core.identity.test</module>
         <module>org.eclipse.kura.core.inventory.test</module>
@@ -956,6 +964,7 @@
         <module>org.eclipse.kura.container.provider.test</module>
         <module>org.eclipse.kura.ai.triton.server.test</module>
         <module>org.eclipse.kura.db.sqlite.provider.test</module>
+        <module>org.eclipse.kura.db.h2db.provider.test</module>
         <module>org.eclipse.kura.message.store.provider.test</module>
         <module>org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.test</module>
         <!--