diff --git a/buildscript/relocations.gradle b/buildscript/relocations.gradle index 40fd8c68..9817bb04 100644 --- a/buildscript/relocations.gradle +++ b/buildscript/relocations.gradle @@ -35,7 +35,6 @@ shadowJar { 'me.minecraftauth.lib', 'com.github.kevinsawicki.http', 'org.json.simple', - 'org.hamcrest', 'alexh', // Adventure (API isn't relocated always) diff --git a/common/build.gradle b/common/build.gradle index 3ae1d44d..4bdbf1c3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -13,8 +13,6 @@ task generateResourceForHikari(type: GenerateDependencyDownloadResourceTask) { var conf = configurations.hikari configuration = conf file = 'dependencies/' + conf.name + '.txt' - relocate 'com.zaxxer.hikari', 'com.discordsrv.dependencies.com.zaxxer.hikari' - relocate 'org.slf4j', 'com.discordsrv.dependencies.org.slf4j' } task generateResourceForH2Driver(type: GenerateDependencyDownloadResourceTask) { var conf = configurations.h2Driver @@ -73,12 +71,15 @@ dependencies { runtimeDownloadApi(libs.enhancedlegacytext) // Database - hikari(libs.hikaricp) { exclude group: 'org.slf4j' } + hikari(libs.hikaricp) h2Driver(libs.h2) mysqlDriver(libs.mysql) // MinecraftAuthentication library - mcAuthLib(libs.minecraftauth.lib) + mcAuthLib(libs.minecraftauth.lib) { + exclude group: 'junit', module: 'junit' + exclude group: 'org.jetbrains', module: 'annotations' + } // Brigadier compileOnlyApi(libs.brigadier)