From 955e553831fbe06eb67029ba10882926c76eb87f Mon Sep 17 00:00:00 2001
From: JiaShuo <js982986555@live.com>
Date: Fri, 15 Nov 2019 16:46:00 +0800
Subject: [PATCH 1/2] shade zkclient&guava

---
 .gitignore |  1 +
 pom.xml    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/.gitignore b/.gitignore
index a70baad8..1cae4d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ rolling_log/
 .vscode/
 google-java-format-*
 pegasus-*
+dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 20efe87a..2fe57466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
     </plugins>
   </reporting>
   <properties>
+    <pegasus.shade.name>com.xiaomi.infra.pegasus.thirdparty</pegasus.shade.name>
   </properties>
   <build>
     <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
@@ -94,6 +95,36 @@
     <outputDirectory>${project.basedir}/target/classes</outputDirectory>
     <testOutputDirectory>${project.basedir}/target/test-classes</testOutputDirectory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>com.101tec</include>
+                  <include>com.google.guava</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>${pegasus.shade.name}.com.google</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.I0Itec</pattern>
+                  <shadedPattern>${pegasus.shade.name}.org.I0Itec</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>

From bd4fe72191765ae249c707c563473e85d0b21c5f Mon Sep 17 00:00:00 2001
From: JiaShuo <js982986555@live.com>
Date: Tue, 19 Nov 2019 10:53:28 +0800
Subject: [PATCH 2/2] shade zkclient&guava

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1cae4d14..4bb31109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@ rolling_log/
 .vscode/
 google-java-format-*
 pegasus-*
-dependency-reduced-pom.xml
\ No newline at end of file
+dependency-reduced-pom.xml