diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 53ad254f7..80d527cb1 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -109,7 +109,8 @@ shadowJar { relocate("org.bstats", "com.plotsquared.metrics") relocate('com.sk89q.squirrelid', 'com.plotsquared.squirrelid') relocate('org.khelekore.prtree', 'com.plotsquared.prtree') - relocate('org.apache.logging.log4j', 'com.plotsquared.logging') + relocate('org.apache.logging', 'com.plotsquared.logging.apache') + relocate('org.slf4j', 'com.plotsquared.logging.slf4j') archiveFileName = "${project.name}-${parent.version}.jar" destinationDirectory = file "../target" } diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index fa9ecf402..81b4e9cf2 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -78,12 +78,6 @@ - - org.slf4j - slf4j-jdk14 - 2.0.0-alpha1 - compile - com.sk89q.worldedit worldedit-core @@ -170,6 +164,24 @@ 4.0-dev-106 runtime + + org.apache.logging.log4j + log4j-slf4j-impl + 2.13.3 + runtime + + + org.apache.logging.log4j + log4j-core + 2.13.3 + runtime + + + org.apache.logging.log4j + log4j-api + 2.13.3 + runtime + junit junit diff --git a/Core/pom.xml b/Core/pom.xml index 3a66b7985..75d0d059e 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -99,9 +99,21 @@ runtime - org.slf4j - slf4j-api - 2.0.0-alpha1 + org.apache.logging.log4j + log4j-slf4j-impl + 2.13.3 + runtime + + + org.apache.logging.log4j + log4j-core + 2.13.3 + runtime + + + org.apache.logging.log4j + log4j-api + 2.13.3 runtime