From 9512528b352f3ed8cbca19f94bb4670c95851c1c Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Mon, 27 Feb 2023 00:40:36 +0100
Subject: [PATCH] Relocate MySQL database extension dependencies

---
 database/mysql/build.gradle.kts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/database/mysql/build.gradle.kts b/database/mysql/build.gradle.kts
index 3b6f25a3..3975a2e0 100644
--- a/database/mysql/build.gradle.kts
+++ b/database/mysql/build.gradle.kts
@@ -1,12 +1,17 @@
-val mysqlClientVersion = "8.0.30"
-val hikariVersion = "4.0.3"
-
 dependencies {
-    provided(projects.core)
-    implementation("mysql", "mysql-connector-java", mysqlClientVersion)
-    implementation("com.zaxxer", "HikariCP", hikariVersion)
+  provided(projects.core)
+
+  // update HikariCP when we move to Java 11+
+  implementation("com.zaxxer", "HikariCP", "4.0.3")
+
+  implementation("com.mysql", "mysql-connector-j", "8.0.32") {
+    exclude("com.google.protobuf", "protobuf-java")
+  }
 }
 
 description = "The Floodgate database extension for MySQL"
 
-relocate("org.mariadb")
+// relocate everything from mysql-connector-j and HikariCP
+relocate("com.mysql")
+relocate("com.zaxxer.hikari")
+relocate("org.slf4j")