Extract MariaDB into a separate repository. See #337

testcontainers · Jun 9, 2017 · 8d8c12f · 8d8c12f
1 parent ac89ac6
commit 8d8c12f
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 347 deletions.
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -42,13 +42,7 @@ public static Iterable<Object[]> data() {
                         {"jdbc:tc:mysql://hostname/databasename?useUnicode=yes&characterEncoding=utf8", false, true, false},
                         {"jdbc:tc:mysql://hostname/databasename", false, false, false},
                         {"jdbc:tc:postgresql://hostname/databasename", false, false, false},
-                        {"jdbc:tc:mariadb:10.1.16://hostname/databasename", false, false, false},
-                        {"jdbc:tc:mariadb://hostname/databasename", false, false, false},
-                        {"jdbc:tc:mariadb://hostname/databasename?useUnicode=yes&characterEncoding=utf8", false, true, false},
-                        {"jdbc:tc:mariadb://hostname/databasename?TC_INITSCRIPT=somepath/init_mariadb.sql", true, false, false},
-                        {"jdbc:tc:mariadb://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", true, false, false},
                         {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", false, false, true},
-                        {"jdbc:tc:mariadb:10.1.16://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", false, false, true}
                 });
     }
 

diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
diff --git a/modules/jdbc-test/src/test/resources/somepath/init_mariadb.sql b/modules/jdbc-test/src/test/resources/somepath/init_mariadb.sql
diff --git a/modules/jdbc-test/src/test/resources/somepath/mariadb_conf_override/my.cnf b/modules/jdbc-test/src/test/resources/somepath/mariadb_conf_override/my.cnf
diff --git a/modules/mariadb/pom.xml b/modules/mariadb/pom.xml
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
diff --git a/...n/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/...n/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
diff --git a/modules/mariadb/src/main/resources/mariadb-default-conf/my.cnf b/modules/mariadb/src/main/resources/mariadb-default-conf/my.cnf
diff --git a/pom.xml b/pom.xml
@@ -178,7 +178,7 @@
         <module>modules/postgresql</module>
         <module>modules/selenium</module>
         <module>modules/nginx</module>
-        <module>modules/mariadb</module>
+        <module>modules/jdbc-test</module>
     </modules>
 
     <profiles>