[rocketmq-clients] branch master updated: Exclude annotation-apis from the shaded jar (#177)

[aaronai]

This is an automated email from the ASF dual-hosted git repository.

aaronai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e14d11  Exclude annotation-apis from the shaded jar (#177)
4e14d11 is described below

commit 4e14d1166a00bdba1695fbf3fed0f7757a36b33d
Author: Aaron Ai <yangkun....@gmail.com>
AuthorDate: Wed Aug 24 14:46:47 2022 +0800

    Exclude annotation-apis from the shaded jar (#177)
---
 java/client-shade/pom.xml |  9 +++++++++
 java/client/pom.xml       |  4 ++++
 java/pom.xml              | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/java/client-shade/pom.xml b/java/client-shade/pom.xml
index 894a936..ea32689 100644
--- a/java/client-shade/pom.xml
+++ b/java/client-shade/pom.xml
@@ -41,6 +41,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-client-java-noshade</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>annotations-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -56,6 +60,11 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    
<exclude>org.apache.tomcat:annotations-api</exclude>
+                                </excludes>
+                            </artifactSet>
                             <minimizeJar>false</minimizeJar>
                             <createSourcesJar>true</createSourcesJar>
                             <shadeSourcesContent>true</shadeSourcesContent>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 46829e6..aee542b 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-proto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>annotations-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 64168d0..2d07d6d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -48,6 +48,7 @@
            ~  2. Make sure that it is compatible with Java 8.
          -->
         <rocketmq-proto.version>2.0.0</rocketmq-proto.version>
+        <annotations-api.version>6.0.53</annotations-api.version>
         <protobuf.version>3.19.2</protobuf.version>
         <grpc.version>1.47.0</grpc.version>
         <guava.version>31.1-jre</guava.version>
@@ -118,8 +119,17 @@
                         <groupId>io.grpc</groupId>
                         <artifactId>grpc-netty-shaded</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>annotations-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>annotations-api</artifactId>
+                <version>${annotations-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java-util</artifactId>