From d141b040d6fcbf85dd293c6591f655a1201a2953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Mon, 13 Jul 2020 20:45:04 +0200
Subject: [PATCH] Fix relocations

---
 Bukkit/build.gradle |  3 ++-
 Bukkit/pom.xml      | 24 ++++++++++++++++++------
 Core/pom.xml        | 18 +++++++++++++++---
 3 files changed, 35 insertions(+), 10 deletions(-)

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 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <version>2.0.0-alpha1</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.sk89q.worldedit</groupId>
       <artifactId>worldedit-core</artifactId>
@@ -170,6 +164,24 @@
       <version>4.0-dev-106</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>2.13.3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.13.3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.13.3</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
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 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>2.0.0-alpha1</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>2.13.3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.13.3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.13.3</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>