From 73d662b1b4e5c077d5ef9a65ee26acf018ee9d93 Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Wed, 13 Dec 2017 18:28:03 +0800
Subject: [PATCH] add relocation config of org.apache.http and
 org.apache.commons 's package

---
 apm-sniffer/apm-agent-core/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index c610d973d8..70d2ebf9d4 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -50,6 +50,10 @@
         <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>
     </properties>
 
     <dependencies>
@@ -176,6 +180,14 @@
                                     <pattern>${shade.io.opencensus.source}</pattern>
                                     <shadedPattern>${shade.io.opencensus.target}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>${shade.org.apache.http.source}</pattern>
+                                    <shadedPattern>${shade.org.apache.http.target}</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>${shade.org.apache.commons.source}</pattern>
+                                    <shadedPattern>${shade.org.apache.commons.target}</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
-- 
GitLab