From 04603b20270f33fcd8ad2059d940a198dbb34d59 Mon Sep 17 00:00:00 2001
From: Jiajing LU <lujiajing1126@gmail.com>
Date: Mon, 8 May 2023 12:12:02 +0800
Subject: [PATCH] Chore: fix exclusion rules in maven-shade-plugin (#525)

* exclude checkerframework j2objc, and protos
---
 CHANGES.md                         | 2 ++
 apm-sniffer/apm-agent-core/pom.xml | 2 ++
 apm-sniffer/apm-agent/pom.xml      | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e255147dc..d861e3a11 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,8 @@ Release Notes.
 * Support monitor jetty server work thread pool metric
 * Support Jersey REST framework
 * Fix ClassCastException when SQLServer inserts data 
+* [Chore] Exclude org.checkerframework:checker-qual and com.google.j2objc:j2objc-annotations
+* [Chore] Exclude proto files in the generated jar
 
 #### Documentation
 
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index e1cd0e0a2..e1120fcc3 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -212,8 +212,10 @@
                                     <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
                                     <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
                                     <exclude>com.google.android:annotations:jar:</exclude>
+                                    <exclude>com.google.j2objc:j2objc-annotations:jar:</exclude>
                                     <exclude>com.google.api.grpc:proto-google-common-protos:jar:</exclude>
                                     <exclude>org.checkerframework:checker-compat-qual:jar:</exclude>
+                                    <exclude>org.checkerframework:checker-qual:jar:</exclude>
                                     <exclude>org.codehaus.mojo:animal-sniffer-annotations:jar:</exclude>
                                 </excludes>
                             </artifactSet>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index d1970b09a..71d75e887 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -83,6 +83,7 @@
                                     <exclude>com.google.*:*</exclude>
                                     <exclude>com.google.guava:guava</exclude>
                                     <exclude>org.checkerframework:checker-compat-qual</exclude>
+                                    <exclude>org.checkerframework:checker-qual</exclude>
                                     <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
                                     <exclude>io.perfmark:*</exclude>
                                     <exclude>org.slf4j:*</exclude>
@@ -101,6 +102,12 @@
                                         <exclude>META-INF/versions/9/module-info.class</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>**/*.proto</exclude>
+                                    </excludes>
+                                </filter>
                             </filters>
                         </configuration>
                     </execution>