diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle index 2782a159a..0cb11f3c9 100644 --- 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 index 73a398a54..9ffb54a9f 100644 --- 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 index e712eadb6..4e5b92c56 100644 --- 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;