Relocated apache packages later

Affects issues: - Fixed #1598
plan-player-analytics · Oct 12, 2020 · eedd432 · eedd432
1 parent 006b74e
commit eedd432
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle
@@ -46,9 +46,7 @@ shadowJar {
     exclude "**/module-info.class"
     exclude 'META-INF/versions/' // Causes Sponge to crash
 
-    relocate('org.apache', 'plan.org.apache') {
-        exclude 'org/apache/logging/**'
-    }
+
     relocate 'com.maxmind', 'plan.com.maxmind'
     relocate 'com.fasterxml', 'plan.com.fasterxml'
     relocate 'com.zaxxer', 'plan.com.zaxxer'

diff --git a/Plan/plugin/build.gradle b/Plan/plugin/build.gradle
@@ -16,6 +16,9 @@ dependencies {
 shadowJar {
     configurations = [project.configurations.compile]
 
+    relocate('org.apache', 'plan.org.apache') {
+        exclude 'org/apache/logging/**'
+    }
     relocate 'dagger', 'plan.dagger'
     relocate 'com.mysql.jdbc', 'plan.com.mysql.jdbc'
     relocate 'com.mysql.cj', 'plan.com.mysql.cj'

diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeMessageBuilder.java b/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeMessageBuilder.java
@@ -16,9 +16,9 @@
  */
 package com.djrapitops.plan.commands.use;
 
+import org.apache.commons.text.TextStringBuilder;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.action.TextActions;
-import plan.org.apache.commons.text.TextStringBuilder;
 
 import java.net.MalformedURLException;
 import java.net.URL;