From 3f8581ab4802d7c95926f4e393471a0a031099e7 Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sat, 21 Oct 2023 19:30:35 +0800
Subject: [PATCH] Add j2objc-annotations license

---
 .../proxy-native/src/main/release-docs/LICENSE   |  1 +
 distribution/proxy/src/main/release-docs/LICENSE |  1 +
 pom.xml                                          | 16 ++++++----------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
index c5fa7f3dde2c6..9cfaafa9c9ba3 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -257,6 +257,7 @@ The text of each license is the standard Apache 2.0 license.
     httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
     httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
     httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
+    j2objc-annotations 1.3 https://github.com/google/j2objc/, Apache 2.0
     jackson-annotations 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jackson-core 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jackson-databind 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index c5fa7f3dde2c6..9cfaafa9c9ba3 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -257,6 +257,7 @@ The text of each license is the standard Apache 2.0 license.
     httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
     httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
     httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
+    j2objc-annotations 1.3 https://github.com/google/j2objc/, Apache 2.0
     jackson-annotations 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jackson-core 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
     jackson-databind 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
diff --git a/pom.xml b/pom.xml
index 57e326ef0ae4f..e7f5a3bb1cb7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
         <guava.version>32.1.2-jre</guava.version>
         <checker-qual.version>3.39.0</checker-qual.version>
         <error_prone_annotations.version>2.22.0</error_prone_annotations.version>
+        <j2objc-annotations.version>1.3</j2objc-annotations.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-codec.version>1.16.0</commons-codec.version>
@@ -177,10 +178,6 @@
                         <groupId>com.google.guava</groupId>
                         <artifactId>listenablefuture</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>com.google.j2objc</groupId>
-                        <artifactId>j2objc-annotations</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -193,6 +190,11 @@
                 <artifactId>error_prone_annotations</artifactId>
                 <version>${error_prone_annotations.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.j2objc</groupId>
+                <artifactId>j2objc-annotations</artifactId>
+                <version>${j2objc-annotations.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -370,12 +372,6 @@
                 <version>${protobuf.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.j2objc</groupId>
-                        <artifactId>j2objc-annotations</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             
             <dependency>