diff --git a/apm-network/pom.xml b/apm-network/pom.xml index c4a2b581a56d05c8f856b93cab8dcfd186eeed4c..200ca27c38412b1ad49c3b1e5cc4bc7d0e505b48 100644 --- a/apm-network/pom.xml +++ b/apm-network/pom.xml @@ -16,6 +16,14 @@ 1.4.0 1.6 + + org.skywalking.apm.dependencies + com.google + ${shade.package}.${shade.com.google.source} + io.grpc + ${shade.package}.${shade.io.grpc.source} + io.netty + ${shade.package}.${shade.io.netty.source} @@ -78,6 +86,91 @@ + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + false + true + true + true + + + ${shade.com.google.source} + ${shade.com.google.target} + + + ${shade.io.grpc.source} + ${shade.io.grpc.target} + + + ${shade.io.netty.source} + ${shade.io.netty.target} + + + ${shade.io.netty.source} + ${shade.io.netty.target} + + + + + io.grpc:grpc-*:jar:* + io.netty:netty-*:jar:* + com.google.protobuf:*:jar:* + com.google.code.gson:gson:jar:* + com.google.guava:guava:jar:* + + + + + com.google.protobuf:protobuf-java + + google/ + + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + unpack + package + + + + + + + + + + + + run + + + + diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index 92d678ba7b443985f49e536f018a86de34e9e5a0..efe6350c500b92607bfc96b645274967a00c5781 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -132,11 +132,11 @@ true + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> skywalking-plugin.def + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> ${premain.class} @@ -149,6 +149,10 @@ commons-logging:* commons-codec:* *:gson + io.grpc:* + io.netty:* + com.google.protobuf:* + com.google.guava:guava