From a139862c797a69cab969d14c3510eacf38bef98c Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Fri, 23 Jun 2017 17:08:53 +0800
Subject: [PATCH] Revert "Add  logic of shade grpc package"

This reverts commit c52686f89403faf12a44767cd6070c472feb5734.
---
 apm-network/pom.xml           | 93 -----------------------------------
 apm-sniffer/apm-agent/pom.xml |  8 +--
 2 files changed, 2 insertions(+), 99 deletions(-)

diff --git a/apm-network/pom.xml b/apm-network/pom.xml
index 200ca27c3..c4a2b581a 100644
--- a/apm-network/pom.xml
+++ b/apm-network/pom.xml
@@ -16,14 +16,6 @@
         <grpc.version>1.4.0</grpc.version>
 
         <compiler.version>1.6</compiler.version>
-
-        <shade.package>org.skywalking.apm.dependencies</shade.package>
-        <shade.com.google.source>com.google</shade.com.google.source>
-        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>
-        <shade.io.grpc.source>io.grpc</shade.io.grpc.source>
-        <shade.io.grpc.target>${shade.package}.${shade.io.grpc.source}</shade.io.grpc.target>
-        <shade.io.netty.source>io.netty</shade.io.netty.source>
-        <shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
     </properties>
 
     <dependencies>
@@ -86,91 +78,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
-                            <shadeSourcesContent>true</shadeSourcesContent>
-                            <relocations>
-                                <relocation>
-                                    <pattern>${shade.com.google.source}</pattern>
-                                    <shadedPattern>${shade.com.google.target}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>${shade.io.grpc.source}</pattern>
-                                    <shadedPattern>${shade.io.grpc.target}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <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>
-                            <artifactSet>
-                                <includes>
-                                    <include>io.grpc:grpc-*:jar:*</include>
-                                    <inclued>io.netty:netty-*:jar:*</inclued>
-                                    <inclued>com.google.protobuf:*:jar:*</inclued>
-                                    <inclued>com.google.code.gson:gson:jar:*</inclued>
-                                    <include>com.google.guava:guava:jar:*</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>com.google.protobuf:protobuf-java</artifact>
-                                    <excludes>
-                                        <exclude>google/</exclude>
-                                    </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"/>
-                                    <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>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index efe6350c5..92d678ba7 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -132,11 +132,11 @@
                             <shadeSourcesContent>true</shadeSourcesContent>
                             <transformers>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>skywalking-plugin.def</resource>
                                 </transformer>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Premain-Class>${premain.class}</Premain-Class>
                                     </manifestEntries>
@@ -149,10 +149,6 @@
                                     <exclude>commons-logging:*</exclude>
                                     <exclude>commons-codec:*</exclude>
                                     <exclude>*:gson</exclude>
-                                    <exclude>io.grpc:*</exclude>
-                                    <exclude>io.netty:*</exclude>
-                                    <exclude>com.google.protobuf:*</exclude>
-                                    <exclude>com.google.guava:guava</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>
-- 
GitLab