diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 99ba6dad3..7b99ebf49 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -99,8 +99,7 @@ tasks { relocate("org.ahocorasick", "net.momirealms.craftengine.libraries.ahocorasick") relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") - relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") + relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") } } diff --git a/bukkit/loader/build.gradle.kts b/bukkit/loader/build.gradle.kts index 3d19d27cf..451c06412 100644 --- a/bukkit/loader/build.gradle.kts +++ b/bukkit/loader/build.gradle.kts @@ -77,7 +77,6 @@ tasks { relocate("software.amazon.awssdk", "net.momirealms.craftengine.libraries.awssdk") relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") - relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") + relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") } } diff --git a/bukkit/loader/src/main/resources/craft-engine.properties b/bukkit/loader/src/main/resources/craft-engine.properties index d8ee70d9f..be2f90fc4 100644 --- a/bukkit/loader/src/main/resources/craft-engine.properties +++ b/bukkit/loader/src/main/resources/craft-engine.properties @@ -21,6 +21,7 @@ slf4j-api=${slf4j_version} zstd-jni=${zstd_version} commons-io=${commons_io_version} commons-imaging=${commons_imaging_version} +commons-lang3=${commons_lang3_version} byte-buddy=${byte_buddy_version} snake-yaml=${snake_yaml_version} examination-api=1.3.0 diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 9b1785c7a..63f8c608f 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -96,7 +96,7 @@ tasks { relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") // awssdk relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") + relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 5996289c3..f5bd10531 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -302,7 +302,7 @@ public abstract class CraftEngine implements Plugin { Dependencies.GEANTY_REF, Dependencies.CLOUD_CORE, Dependencies.CLOUD_SERVICES, Dependencies.GSON, - Dependencies.COMMONS_IO, + Dependencies.COMMONS_IO, Dependencies.COMMONS_LANG3, Dependencies.COMMONS_IMAGING, Dependencies.ZSTD, Dependencies.BYTE_BUDDY, Dependencies.SNAKE_YAML, @@ -316,8 +316,7 @@ public abstract class CraftEngine implements Plugin { Dependencies.LZ4, Dependencies.EVALEX, Dependencies.NETTY_HTTP, - Dependencies.JIMFS, - Dependencies.COMMONS_IMAGING + Dependencies.JIMFS ); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java index 2616f5142..a7e7a1b58 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java @@ -158,6 +158,13 @@ public class Dependencies { } }; + public static final Dependency COMMONS_LANG3 = new Dependency( + "commons-lang3", + "org{}apache{}commons", + "commons-lang3", + List.of(Relocation.of("commons", "org{}apache{}commons")) + ); + public static final Dependency COMMONS_IO = new Dependency( "commons-io", "commons-io", @@ -165,6 +172,13 @@ public class Dependencies { List.of(Relocation.of("commons", "org{}apache{}commons")) ); + public static final Dependency COMMONS_IMAGING = new Dependency( + "commons-imaging", + "org{}apache{}commons", + "commons-imaging", + List.of(Relocation.of("commons", "org{}apache{}commons")) + ); + public static final Dependency BYTE_BUDDY = new Dependency( "byte-buddy", "net{}bytebuddy", @@ -381,12 +395,6 @@ public class Dependencies { List.of(Relocation.of("jimfs", "com{}google{}common{}jimfs")) ); - public static final Dependency COMMONS_IMAGING = new Dependency( - "commons-imaging", - "org{}apache{}commons", - "commons-imaging", - List.of(Relocation.of("commons", "org{}apache{}commons")) - ); public static final Dependency AMAZON_AWSSDK_S3 = new Dependency( "amazon-sdk-s3", diff --git a/gradle.properties b/gradle.properties index bc9dcb2a0..4ccf7e548 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,6 +39,7 @@ geantyref_version=1.3.16 zstd_version=1.5.7-2 commons_io_version=2.18.0 commons_imaging_version=1.0.0-alpha6 +commons_lang3_version=3.17.0 sparrow_nbt_version=0.9.0 sparrow_util_version=0.47 fastutil_version=8.5.15