diff --git a/modules/common/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Rdbms.scala b/modules/common/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Rdbms.scala index 85d40c9e0..308610660 100644 --- a/modules/common/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Rdbms.scala +++ b/modules/common/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Rdbms.scala @@ -56,13 +56,12 @@ object Rdbms { database: String ) extends Rdbms { - val driver: Class[_] = Class.forName("com.mysql.cj.jdbc.Driver") // Load class + val driver: Class[_] = Class.forName("org.mariadb.jdbc.Driver") // Load class + + val sslModeParam: String = if (sslMode) "&sslMode=trust" else "&sslMode=disable&allowPublicKeyRetrieval=true" val connectionString = - s"jdbc:mysql://$host:$port/$database?user=$username&password=$password" ++ (if (sslMode) - "&sslMode=REQUIRED" - else - "&sslMode=PREFERRED") + s"jdbc:mysql://$host:$port/$database?permitMysqlScheme&user=$username&password=$password$sslModeParam" } val postgresqlDbDecoder: Decoder[PostgresqlDb] = diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cf99f3761..73283ae08 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -35,7 +35,7 @@ object Dependencies { val uaParser = "1.5.4" val snakeYaml = "2.2" val postgresDriver = "42.7.2" - val mysqlConnector = "8.3.0" + val mysqlClient = "3.4.0" val hikariCP = "5.0.1" val jaywayJsonpath = "2.7.0" val jsonsmart = "2.4.10" @@ -114,7 +114,7 @@ object Dependencies { val snakeYaml = "org.yaml" % "snakeyaml" % V.snakeYaml val uaParser = "com.github.ua-parser" % "uap-java" % V.uaParser val postgresDriver = "org.postgresql" % "postgresql" % V.postgresDriver - val mysqlConnector = "com.mysql" % "mysql-connector-j" % V.mysqlConnector + val mysqlClient = "org.mariadb.jdbc" % "mariadb-java-client" % V.mysqlClient val hikariCP = ("com.zaxxer" % "HikariCP" % V.hikariCP) .exclude("org.slf4j", "slf4j-api") val jaywayJsonpath = "com.jayway.jsonpath" % "json-path" % V.jaywayJsonpath @@ -219,7 +219,7 @@ object Dependencies { uaParser, snakeYaml, postgresDriver, - mysqlConnector, + mysqlClient, hikariCP, jaywayJsonpath, jsonsmart,