Skip to content

Commit 04603b2

Browse files
Chore: fix exclusion rules in maven-shade-plugin (#525)
* exclude checkerframework j2objc, and protos
1 parent e09809f commit 04603b2

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Release Notes.
1111
* Support monitor jetty server work thread pool metric
1212
* Support Jersey REST framework
1313
* Fix ClassCastException when SQLServer inserts data
14+
* [Chore] Exclude org.checkerframework:checker-qual and com.google.j2objc:j2objc-annotations
15+
* [Chore] Exclude proto files in the generated jar
1416

1517
#### Documentation
1618

apm-sniffer/apm-agent-core/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,10 @@
212212
<exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
213213
<exclude>com.google.code.findbugs:jsr305:jar:</exclude>
214214
<exclude>com.google.android:annotations:jar:</exclude>
215+
<exclude>com.google.j2objc:j2objc-annotations:jar:</exclude>
215216
<exclude>com.google.api.grpc:proto-google-common-protos:jar:</exclude>
216217
<exclude>org.checkerframework:checker-compat-qual:jar:</exclude>
218+
<exclude>org.checkerframework:checker-qual:jar:</exclude>
217219
<exclude>org.codehaus.mojo:animal-sniffer-annotations:jar:</exclude>
218220
</excludes>
219221
</artifactSet>

apm-sniffer/apm-agent/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<exclude>com.google.*:*</exclude>
8484
<exclude>com.google.guava:guava</exclude>
8585
<exclude>org.checkerframework:checker-compat-qual</exclude>
86+
<exclude>org.checkerframework:checker-qual</exclude>
8687
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
8788
<exclude>io.perfmark:*</exclude>
8889
<exclude>org.slf4j:*</exclude>
@@ -101,6 +102,12 @@
101102
<exclude>META-INF/versions/9/module-info.class</exclude>
102103
</excludes>
103104
</filter>
105+
<filter>
106+
<artifact>*:*</artifact>
107+
<excludes>
108+
<exclude>**/*.proto</exclude>
109+
</excludes>
110+
</filter>
104111
</filters>
105112
</configuration>
106113
</execution>

0 commit comments

Comments
 (0)