kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking into feature/high-performance-agent 

* 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking:
  let the sense of filter more clear
  Fix issue that skywalking-agent.jar include the google class  and exclude the proto files inside protobuf-java
This commit is contained in:
wusheng 2017-06-30 20:08:39 +08:00
parent 8c9c3e65b8 e2c85d99b6
commit dd268b2eb2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apm-sniffer/apm-agent-core/pom.xml
View File

@ -140,6 +140,15 @@
<shadedPattern>${shade.io.netty.target}</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.google.protobuf:protobuf-java</artifact>
<excludes>
<exclude>google/protobuf/*.proto</exclude>
<exclude>google/protobuf/compiler/*.proto</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>

2
apm-sniffer/apm-agent/pom.xml
View File

@ -151,7 +151,7 @@
<exclude>*:gson</exclude>
<exclude>io.grpc:*</exclude>
<exclude>io.netty:*</exclude>
<exclude>com.google.protobuf:*</exclude>
<exclude>com.google.*:*</exclude>
<exclude>com.google.guava:guava</exclude>
</excludes>
</artifactSet>