From 911bdbc40018e60c290f4da3c66e9c3fe7462b04 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 23 Dec 2021 13:35:13 +0000 Subject: [PATCH] Fix #12, bump to 1.2.1 --- build.gradle | 2 +- bukkit/build.gradle | 2 +- bungeecord/build.gradle | 2 +- .../main/java/me/william278/husksync/HuskSyncBungeeCord.java | 2 +- common/build.gradle | 2 +- .../java/me/william278/husksync/proxy/data/sql/MySQL.java | 3 +++ velocity/build.gradle | 2 +- .../main/java/me/william278/husksync/HuskSyncVelocity.java | 4 ++-- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 5e00032e..ba011d4d 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { allprojects { group 'me.William278' - version '1.2' + version '1.2.1' compileJava { options.encoding = 'UTF-8' } tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } diff --git a/bukkit/build.gradle b/bukkit/build.gradle index b6858d4c..a751be0e 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -3,7 +3,7 @@ dependencies { compileOnly project(':api') implementation project(path: ':common', configuration: 'shadow') - compileOnly 'redis.clients:jedis:3.7.0' + compileOnly 'redis.clients:jedis:4.0.0' implementation 'org.bstats:bstats-bukkit:2.2.1' implementation 'de.themoep:minedown:1.7.1-SNAPSHOT' diff --git a/bungeecord/build.gradle b/bungeecord/build.gradle index 5c0fba77..71ad3f46 100644 --- a/bungeecord/build.gradle +++ b/bungeecord/build.gradle @@ -2,7 +2,7 @@ dependencies { compileOnly project(':common') implementation project(path: ':common', configuration: 'shadow') - compileOnly 'redis.clients:jedis:3.7.0' + compileOnly 'redis.clients:jedis:4.0.0' implementation 'org.bstats:bstats-bungeecord:2.2.1' implementation 'de.themoep:minedown:1.7.1-SNAPSHOT' implementation 'net.byteflux:libby-bungee:1.1.5' diff --git a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java b/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java index c4edc58f..083c8b55 100644 --- a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java +++ b/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java @@ -156,7 +156,7 @@ public final class HuskSyncBungeeCord extends Plugin { Library mySqlLib = Library.builder() .groupId("mysql") .artifactId("mysql-connector-java") - .version("8.0.25") + .version("8.0.27") .build(); Library sqLiteLib = Library.builder() diff --git a/common/build.gradle b/common/build.gradle index 7f529c67..26bb3ae8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ dependencies { - implementation 'redis.clients:jedis:3.7.0' + implementation 'redis.clients:jedis:4.0.0' implementation 'com.zaxxer:HikariCP:5.0.0' } diff --git a/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java b/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java index f5b8530d..e010d5f8 100644 --- a/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java +++ b/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java @@ -77,6 +77,9 @@ public class MySQL extends Database { dataSource.setUsername(username); dataSource.setPassword(password); + // Set data source driver path + dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); + // Set various additional parameters dataSource.setMaximumPoolSize(hikariMaximumPoolSize); dataSource.setMinimumIdle(hikariMinimumIdle); diff --git a/velocity/build.gradle b/velocity/build.gradle index aac5cba7..8b545f44 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -2,7 +2,7 @@ dependencies { compileOnly project(':common') implementation project(path: ':common', configuration: 'shadow') - compileOnly 'redis.clients:jedis:3.7.0' + compileOnly 'redis.clients:jedis:4.0.0' implementation 'org.bstats:bstats-velocity:2.2.1' implementation 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT' implementation 'net.byteflux:libby-velocity:1.1.5' diff --git a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java index c8586ec3..5ff73d4b 100644 --- a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java +++ b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java @@ -43,7 +43,7 @@ import static me.william278.husksync.HuskSyncVelocity.VERSION; public class HuskSyncVelocity { // Plugin version - public static final String VERSION = "1.2"; + public static final String VERSION = "1.2.1"; // Velocity bStats ID (different from Bukkit and BungeeCord) private static final int METRICS_ID = 13489; @@ -208,7 +208,7 @@ public class HuskSyncVelocity { Library mySqlLib = Library.builder() .groupId("mysql") .artifactId("mysql-connector-java") - .version("8.0.25") + .version("8.0.27") .build(); Library sqLiteLib = Library.builder()