Merge pull request #508 from EmptyIrony/dev/6.2.0

AlkaidRedis: relocate apache pool2
TabooLib · Nov 28, 2024 · 7a5f6e9 · 7a5f6e9
2 parents a1c0648 + 0a8cb26
commit 7a5f6e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/module/database/database-alkaid-redis/build.gradle.kts b/module/database/database-alkaid-redis/build.gradle.kts
@@ -14,6 +14,7 @@ tasks {
         relocate("redis.clients.jedis.", "redis.clients.jedis_4_2_3.")
         relocate("com.electronwill.nightconfig.core.conversion", "taboolib.library.configuration")
         relocate("com.electronwill.nightconfig.", "com.electronwill.nightconfig_3_6_7.")
+        relocate("org.apache.commons.pool2.", "org.apache.commons.pool2_2_11_1.")
         relocate("org.yaml.snakeyaml.", "org.yaml.snakeyaml_2_0.")
     }
 }
diff --git a/module/database/database-alkaid-redis/src/main/kotlin/taboolib/expansion/AlkaidRedis.kt b/module/database/database-alkaid-redis/src/main/kotlin/taboolib/expansion/AlkaidRedis.kt
@@ -24,7 +24,8 @@ import taboolib.common.env.RuntimeDependency
     RuntimeDependency(
         "!redis.clients:jedis:4.2.3",
         test = "!redis.clients.jedis_4_2_3.Jedis",
-        relocate = ["!redis.clients.jedis", "!redis.clients.jedis_4_2_3"],
+        relocate = ["!redis.clients.jedis", "!redis.clients.jedis_4_2_3",
+            "!org.apache.commons.pool2", "!org.apache.commons.pool2_2_11_1"],
         transitive = false
     ),
     RuntimeDependency(
@@ -34,7 +35,8 @@ import taboolib.common.env.RuntimeDependency
     ),
     RuntimeDependency(
         "!org.apache.commons:commons-pool2:2.11.1",
-        test = "!org.apache.commons.pool2.ObjectPool",
+        test = "!org.apache.commons.pool2_2_11_1.ObjectPool",
+        relocate = ["!org.apache.commons.pool2", "!org.apache.commons.pool2_2_11_1"],
         transitive = false
     ),
     RuntimeDependency(