You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/31 11:58:54 UTC
[shardingsphere] branch master updated: Add commons.logging shade for agent (#23225)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 9a6812d4bdc Add commons.logging shade for agent (#23225)
9a6812d4bdc is described below
commit 9a6812d4bdc7b808b5467e5c09111da048d8bdf1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 31 19:58:47 2022 +0800
Add commons.logging shade for agent (#23225)
---
agent/core/pom.xml | 4 ++++
agent/plugins/pom.xml | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index d87ec334205..d86f6a32aae 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -104,6 +104,10 @@
<pattern>org.slf4j</pattern>
<shadedPattern>${shade.package}.org.slf4j</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.logging</pattern>
+ <shadedPattern>${shade.package}.org.apache.commons.logging</shadedPattern>
+ </relocation>
<relocation>
<pattern>ch.qos.logback</pattern>
<shadedPattern>${shade.package}.ch.qos.logback</shadedPattern>
diff --git a/agent/plugins/pom.xml b/agent/plugins/pom.xml
index 948e607ce25..fb6c327e8e1 100644
--- a/agent/plugins/pom.xml
+++ b/agent/plugins/pom.xml
@@ -96,8 +96,8 @@
<shadedPattern>${shade.package}.org.yaml</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>${shade.package}.org.apache.commons</shadedPattern>
+ <pattern>org.apache.commons.logging</pattern>
+ <shadedPattern>${shade.package}.org.apache.commons.logging</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>