From fc0706721578e2a3c8a9d7e3fc78201fe7e59012 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Sat, 4 Jun 2016 23:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86api=E7=9A=84shade=20netty=E5=8C=85=E5=92=8Clo?=
 =?UTF-8?q?g4j=E5=8C=85=E6=8C=AA=E5=88=B0=E4=BA=86agent=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skywalking-agent/pom.xml | 42 +++++++++++++++++++++++++++++++++++++++-
 skywalking-api/pom.xml   | 35 ---------------------------------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/skywalking-agent/pom.xml b/skywalking-agent/pom.xml
index 8a90f4cac..2a3efa84d 100644
--- a/skywalking-agent/pom.xml
+++ b/skywalking-agent/pom.xml
@@ -17,6 +17,12 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <premain.class>com.ai.cloud.skywalking.agent.SkywalkingAgent</premain.class>
+        <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
+        <shade.net.bytebuddy.target>com.ai.cloud.skywalking.api.dependencies.net.bytebuddy</shade.net.bytebuddy.target>
+        <shade.io.netty.source>io.netty</shade.io.netty.source>
+        <shade.io.netty.target>com.ai.cloud.skywalking.api.dependencies.io.netty</shade.io.netty.target>
+        <shade.org.apache.logging.log4j>org.apache.logging.log4j</shade.org.apache.logging.log4j>
+        <shade.org.apache.logging.log4j.target>com.ai.cloud.skywalking.api.dependencies.org.apache.logging.log4j</shade.org.apache.logging.log4j.target>
     </properties>
 
     <dependencies>
@@ -25,13 +31,28 @@
             <artifactId>skywalking-jedis-2.x-plugin</artifactId>
             <version>1.0-Final</version>
         </dependency>
+        <dependency>
+            <groupId>com.ai.cloud</groupId>
+            <artifactId>skywalking-mysql-plugin</artifactId>
+            <version>1.0-Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ai.cloud</groupId>
+            <artifactId>skywalking-httpClient-4.x-plugin</artifactId>
+            <version>1.0-Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ai.cloud</groupId>
+            <artifactId>skywalking-httpClient-4.x-plugin-dubbox-rest-attachment</artifactId>
+            <version>1.0-Final</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
+                <version>2.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -39,6 +60,10 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createSourcesJar>true</createSourcesJar>
+                            <shadeSourcesContent>true</shadeSourcesContent>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -50,6 +75,21 @@
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
+                            <relocations>
+                                <relocation>
+                                    <pattern>${shade.net.bytebuddy.source}</pattern>
+                                    <shadedPattern>${shade.net.bytebuddy.target}</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>${shade.io.netty.source}</pattern>
+                                    <shadedPattern>${shade.io.netty.target}</shadedPattern>
+                                </relocation>
+                                <!--替换log4j -->
+                                <relocation>
+                                    <pattern>${shade.org.apache.logging.log4j}</pattern>
+                                    <shadedPattern>${shade.org.apache.logging.log4j.target}</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/skywalking-api/pom.xml b/skywalking-api/pom.xml
index 0e6055506..c0a71cb96 100644
--- a/skywalking-api/pom.xml
+++ b/skywalking-api/pom.xml
@@ -17,11 +17,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<version.plugin.shade>2.4.1</version.plugin.shade>
-		<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
-		<shade.net.bytebuddy.target>com.ai.cloud.skywalking.api.dependencies.net.bytebuddy</shade.net.bytebuddy.target>
-		<shade.io.netty.source>io.netty</shade.io.netty.source>
-		<shade.io.netty.target>com.ai.cloud.skywalking.api.dependencies.io.netty</shade.io.netty.target>
 	</properties>
 
 	<dependencies>
@@ -89,36 +84,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- Shade the net.bytebuddy/io.netty dependency. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>${version.plugin.shade}</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.net.bytebuddy.source}</pattern>
-									<shadedPattern>${shade.net.bytebuddy.target}</shadedPattern>
-								</relocation>
-								<relocation>
-									<pattern>${shade.io.netty.source}</pattern>
-									<shadedPattern>${shade.io.netty.target}</shadedPattern>
-								</relocation>
-							</relocations>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>