This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new bcdf1c4 fix apm-agent-core maven pom file shade-plugin define bug
(#2769) (#2770)
bcdf1c4 is described below
commit bcdf1c4bd500c574e29a60ce7d2d76a8659a55b5
Author: sk163 <[email protected]>
AuthorDate: Tue May 28 15:04:38 2019 +0800
fix apm-agent-core maven pom file shade-plugin define bug (#2769) (#2770)
* fix apm-agent-core maven pom file shade-plugin define bug (#2769)
---
apm-sniffer/apm-agent-core/pom.xml | 9 ---------
apm-sniffer/apm-agent/pom.xml | 3 ---
2 files changed, 12 deletions(-)
diff --git a/apm-sniffer/apm-agent-core/pom.xml
b/apm-sniffer/apm-agent-core/pom.xml
index 0a18a0c..bfebac1 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -53,11 +53,6 @@
<shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
<shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
<shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
-
<shade.org.apache.http.source>org.apache.http</shade.org.apache.http.source>
-
<shade.org.apache.http.target>${shade.package}.${shade.org.apache.http.source}</shade.org.apache.http.target>
-
<shade.org.apache.commons.source>org.apache.commons</shade.org.apache.commons.source>
-
<shade.org.apache.commons.target>${shade.package}.${shade.org.apache.http.source}
- </shade.org.apache.commons.target>
<ststem-rules.version>1.18.0</ststem-rules.version>
</properties>
@@ -205,10 +200,6 @@
<pattern>${shade.io.opencensus.source}</pattern>
<shadedPattern>${shade.io.opencensus.target}</shadedPattern>
</relocation>
- <relocation>
-
<pattern>${shade.org.apache.commons.source}</pattern>
-
<shadedPattern>${shade.org.apache.commons.target}</shadedPattern>
- </relocation>
</relocations>
<filters>
<filter>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index c9dfe7a..7d7c507 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -73,9 +73,6 @@
<artifactSet>
<excludes>
<exclude>com.lmax:*</exclude>
-
<exclude>org.apache.httpcomponents:*</exclude>
- <exclude>commons-logging:*</exclude>
- <exclude>commons-codec:*</exclude>
<exclude>*:gson</exclude>
<exclude>io.grpc:*</exclude>
<exclude>io.netty:*</exclude>
