You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2024/11/05 12:25:22 UTC
(skywalking-java) branch main updated: fix: shade async-profiler packages (#727)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new f0245864e4 fix: shade async-profiler packages (#727)
f0245864e4 is described below
commit f0245864e4388a388fe7445b56b6ce7cedc94aaf
Author: zhengziyi0117 <91...@users.noreply.github.com>
AuthorDate: Tue Nov 5 20:25:16 2024 +0800
fix: shade async-profiler packages (#727)
---
apm-sniffer/apm-agent-core/pom.xml | 6 ++++++
apm-sniffer/apm-agent/pom.xml | 1 +
2 files changed, 7 insertions(+)
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index fcca095f25..b22c082035 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -53,6 +53,8 @@
<shade.org.slf4j.target>${shade.package}.${shade.org.slf4j.source}</shade.org.slf4j.target>
<ststem-rules.version>1.18.0</ststem-rules.version>
<slf4j.version>1.7.25</slf4j.version>
+ <shade.one.profiler.source>one.profiler</shade.one.profiler.source>
+ <shade.one.profiler.target>${shade.package}.${shade.one.profiler.source}</shade.one.profiler.target>
</properties>
<dependencies>
@@ -253,6 +255,10 @@
<pattern>${shade.org.slf4j.source}</pattern>
<shadedPattern>${shade.org.slf4j.target}</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>${shade.one.profiler.source}</pattern>
+ <shadedPattern>${shade.one.profiler.target}</shadedPattern>
+ </relocation>
</relocations>
<filters>
<filter>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 5f7246b372..0112c21e1c 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -92,6 +92,7 @@
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
<exclude>io.perfmark:*</exclude>
<exclude>org.slf4j:*</exclude>
+ <exclude>tools.profiler:async-profiler</exclude>
</excludes>
</artifactSet>
<relocations>