MariaDB4j version update to 3.3.1 and remove ReusableDb

Author: Abhisy2506

pom-step-01.xml

@@ -17,12 +17,6 @@
 	</parent>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>
             <artifactId>mariaDB4j</artifactId>

pom-step-02.xml

@@ -17,11 +17,6 @@
 	</parent>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
 
         <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>

pom-step-03.xml

@@ -17,11 +17,6 @@
 	</parent>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
 
         <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>

pom-step-04.xml

@@ -17,12 +17,6 @@
 	</parent>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>
             <artifactId>mariaDB4j</artifactId>

pom-step-05.xml

@@ -17,11 +17,6 @@
 	</parent>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
 
         <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>

pom.xml

@@ -109,21 +109,6 @@
     </dependency>
   </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>ch.vorburger.mariaDB4j</groupId>
-                <artifactId>mariaDB4j-core</artifactId>
-                <version>${mariadb4jVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.vorburger.mariaDB4j</groupId>
-                <artifactId>mariaDB4j</artifactId>
-                <version>${mariadb4jVersion}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 
   <build>
     <finalName>openmrs-standalone-${openmrs.version}</finalName>

src/main/java/org/openmrs/standalone/MariaDbController.java

@@ -75,23 +75,18 @@ public static void startMariaDB(int port, String userPassword) throws Exception
         mariaDBConfig.addArg("--character-set-server=utf8");
 
         DBConfiguration config = mariaDBConfig.build();
+        mariaDB = DB.newEmbeddedDB(config);
+        mariaDB.start();
 
         if (isWindows) {
-            // Check the dataDir variable that was defined above on line 66
-            mariaDB = DB.newEmbeddedDB(config);
-            mariaDB.start();
-
-            Connection conn = DriverManager.getConnection("jdbc:mariadb://localhost:" + port + "/", ROOT_USER, ROOT_PASSWORD);
-            try (Statement stmt = conn.createStatement()) {
+            // Windows-specific setup using JDBC try-with-resources
+            try (Connection conn = DriverManager.getConnection("jdbc:mariadb://localhost:" + port + "/", ROOT_USER, ROOT_PASSWORD);
+                 Statement stmt = conn.createStatement()) {
                 stmt.execute("ALTER USER 'root'@'localhost' IDENTIFIED BY '" + ROOT_PASSWORD + "';");
                 stmt.execute("GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;");
             }
-
         } else {
-            // For Linux and macOS
-            mariaDB = DB.newEmbeddedDB(config);
-            mariaDB.start();
-
+            // Linux and macOS-specific setup
             mariaDB.run("ALTER USER 'root'@'localhost' IDENTIFIED BY '" + ROOT_PASSWORD + "';");
             mariaDB.run("GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;");
         }