Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-29 20:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Relocated apache packages later

Browse Source 
Affects issues:
- Fixed #1598
This commit is contained in:
Risto Lahtela 2020-10-12 10:36:02 +03:00
parent 006b74e7fc
commit eedd432994
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/build.gradle
View File

@ -46,9 +46,7 @@ shadowJar {
exclude "**/module-info.class" exclude "**/module-info.class"
exclude 'META-INF/versions/' // Causes Sponge to crash 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.maxmind', 'plan.com.maxmind'
relocate 'com.fasterxml', 'plan.com.fasterxml' relocate 'com.fasterxml', 'plan.com.fasterxml'
relocate 'com.zaxxer', 'plan.com.zaxxer' relocate 'com.zaxxer', 'plan.com.zaxxer'

3
Plan/plugin/build.gradle
View File

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

2
Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeMessageBuilder.java
View File

@ -16,9 +16,9 @@
*/ */
package com.djrapitops.plan.commands.use; package com.djrapitops.plan.commands.use;
import org.apache.commons.text.TextStringBuilder;
import org.spongepowered.api.text.Text; import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.action.TextActions; import org.spongepowered.api.text.action.TextActions;
import plan.org.apache.commons.text.TextStringBuilder;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;