Skip to content

Commit 0a8cb26

Browse files
committed
AlkaidRedis: relocate apache pool2
1 parent a1c0648 commit 0a8cb26

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

‎module/database/database-alkaid-redis/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tasks {
1414
relocate("redis.clients.jedis.", "redis.clients.jedis_4_2_3.")
1515
relocate("com.electronwill.nightconfig.core.conversion", "taboolib.library.configuration")
1616
relocate("com.electronwill.nightconfig.", "com.electronwill.nightconfig_3_6_7.")
17+
relocate("org.apache.commons.pool2.", "org.apache.commons.pool2_2_11_1.")
1718
relocate("org.yaml.snakeyaml.", "org.yaml.snakeyaml_2_0.")
1819
}
1920
}

‎module/database/database-alkaid-redis/src/main/kotlin/taboolib/expansion/AlkaidRedis.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import taboolib.common.env.RuntimeDependency
2424
RuntimeDependency(
2525
"!redis.clients:jedis:4.2.3",
2626
test = "!redis.clients.jedis_4_2_3.Jedis",
27-
relocate = ["!redis.clients.jedis", "!redis.clients.jedis_4_2_3"],
27+
relocate = ["!redis.clients.jedis", "!redis.clients.jedis_4_2_3",
28+
"!org.apache.commons.pool2", "!org.apache.commons.pool2_2_11_1"],
2829
transitive = false
2930
),
3031
RuntimeDependency(
@@ -34,7 +35,8 @@ import taboolib.common.env.RuntimeDependency
3435
),
3536
RuntimeDependency(
3637
"!org.apache.commons:commons-pool2:2.11.1",
37-
test = "!org.apache.commons.pool2.ObjectPool",
38+
test = "!org.apache.commons.pool2_2_11_1.ObjectPool",
39+
relocate = ["!org.apache.commons.pool2", "!org.apache.commons.pool2_2_11_1"],
3840
transitive = false
3941
),
4042
RuntimeDependency(

0 commit comments

Comments
 (0)