From cada42d10feeb0439b2b6f047cafb4cb24dc1acb Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Fri, 30 Jun 2017 23:04:53 +0800
Subject: [PATCH] Change shade plugin version and remove duplicate relocation

---
 apm-sniffer/apm-agent-core/pom.xml | 40 ++++--------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index ab9c00f09..b5a63c478 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -98,7 +98,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -135,10 +135,6 @@
                                     <pattern>${shade.io.netty.source}</pattern>
                                     <shadedPattern>${shade.io.netty.target}</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>${shade.io.netty.source}</pattern>
-                                    <shadedPattern>${shade.io.netty.target}</shadedPattern>
-                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
@@ -149,40 +145,14 @@
                                     </excludes>
                                 </filter>
                             </filters>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <unzip src="${project.build.directory}/${artifactId}-${version}.jar"
-                                       dest="${project.build.directory}/unpacked/"/>
-                                <move todir="${project.build.directory}/unpacked/META-INF/services"
-                                      includeemptydirs="false">
-                                    <fileset dir="${project.build.directory}/unpacked/META-INF/services">
-                                        <include name="io.grpc.*"/>
-                                    </fileset>
-                                    <mapper type="glob" from="*" to="${shade.package}.*"/>
-                                </move>
-                                <jar destfile="${project.build.directory}/${artifactId}-${version}.jar"
-                                     basedir="${project.build.directory}/unpacked"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 </project>