From 9bce89fcb8aad161bc8d9d12a998a91903447d17 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Wed, 20 Nov 2024 15:52:01 +0200
Subject: [PATCH] Revert adding mariadb (#2087)

* Revert "Add mariadb-java-client to the server images (#2086)"

This reverts commit 8d3aa7c9cee9aec5d67238b1a79e33eb39892cda.

* Revert adding mariadb as runtime dependency - resticted license

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

---------

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 hawkbit-ddi/hawkbit-ddi-server/pom.xml         | 9 +++++----
 hawkbit-dmf/hawkbit-dmf-server/pom.xml         | 4 ----
 hawkbit-mgmt/hawkbit-mgmt-server/pom.xml       | 9 +++++----
 hawkbit-monolith/hawkbit-update-server/pom.xml | 9 +++++----
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/hawkbit-ddi/hawkbit-ddi-server/pom.xml b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
index b0c6b8189..f9bf89cc6 100644
--- a/hawkbit-ddi/hawkbit-ddi-server/pom.xml
+++ b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
@@ -42,10 +42,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency> <!-- if run against mysql with jdbc:mysql schema -->
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
@@ -62,6 +58,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency> <!-- if run against mysql -->
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/hawkbit-dmf/hawkbit-dmf-server/pom.xml b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
index 4613b1e2e..3a9b34585 100644
--- a/hawkbit-dmf/hawkbit-dmf-server/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
@@ -42,10 +42,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency> <!-- if run against mysql with jdbc:mysql schema -->
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml b/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml
index e34c4591f..d02794427 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml
+++ b/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml
@@ -42,10 +42,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency> <!-- if run against mysql with jdbc:mysql schema -->
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
@@ -62,6 +58,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency> <!-- if run against mysql -->
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/hawkbit-monolith/hawkbit-update-server/pom.xml b/hawkbit-monolith/hawkbit-update-server/pom.xml
index 83ff7ca7b..f0994ec64 100644
--- a/hawkbit-monolith/hawkbit-update-server/pom.xml
+++ b/hawkbit-monolith/hawkbit-update-server/pom.xml
@@ -36,10 +36,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency> <!-- if run against mysql with jdbc:mysql schema -->
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
@@ -55,6 +51,11 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
             <artifactId>hawkbit-repository-test</artifactId>