From 8d3aa7c9cee9aec5d67238b1a79e33eb39892cda Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Wed, 20 Nov 2024 09:57:36 +0200
Subject: [PATCH] Add mariadb-java-client to the server images (#2086)

So, they will be ready to connect to mysql

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, 16 insertions(+), 15 deletions(-)

diff --git a/hawkbit-ddi/hawkbit-ddi-server/pom.xml b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
index f9bf89cc6..b0c6b8189 100644
--- a/hawkbit-ddi/hawkbit-ddi-server/pom.xml
+++ b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
@@ -42,6 +42,10 @@
             <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>
@@ -58,11 +62,6 @@
             <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 3a9b34585..4613b1e2e 100644
--- a/hawkbit-dmf/hawkbit-dmf-server/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
@@ -42,6 +42,10 @@
             <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 d02794427..e34c4591f 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml
+++ b/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml
@@ -42,6 +42,10 @@
             <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>
@@ -58,11 +62,6 @@
             <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 e9b395bd5..83ff7ca7b 100644
--- a/hawkbit-monolith/hawkbit-update-server/pom.xml
+++ b/hawkbit-monolith/hawkbit-update-server/pom.xml
@@ -36,6 +36,10 @@
             <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>
@@ -51,11 +55,6 @@
             <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>