From 278dcffcdb29f6844fd48e5b839be5eca4449f80 Mon Sep 17 00:00:00 2001
From: Liang Zhang <zhangliang@apache.org>
Date: Fri, 13 Oct 2023 07:42:18 +0800
Subject: [PATCH] Resolve dependencies conflict for guava (#28743)

* Upgrade guava version

* Upgrade grpc version

* Upgrade netty version

* Upgrade postgresql version

* Upgrade json-path version

* Resolve dependency conflict

* Resolve dependency conflict for json-path

* Resolve dependency conflict for json-path

* Resolve dependency conflict for checker-qual

* Resolve dependency conflict for checker-qual

* Resolve dependency conflict for error_prone_annotations
---
 .../src/main/release-docs/LICENSE             |  4 +--
 .../proxy/src/main/release-docs/LICENSE       |  4 +--
 pom.xml                                       | 26 +++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
index 2a4bd851dfe0c..dad8e756555ba 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -234,7 +234,7 @@ The text of each license is the standard Apache 2.0 license.
     curator-client 5.4.0:  https://github.com/apache/curator, Apache 2.0
     curator-framework 5.4.0:  https://github.com/apache/curator, Apache 2.0
     curator-recipes 5.4.0:  https://github.com/apache/curator, Apache 2.0
-    error_prone_annotations 2.11.0: https://github.com/google/error-prone, Apache 2.0
+    error_prone_annotations 2.22.0: https://github.com/google/error-prone, Apache 2.0
     failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0
     failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
     freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
@@ -367,6 +367,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     bcprov-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bctls-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bcutil-jdk15on 1.70: https://www.bouncycastle.org, MIT
-    checker-qual 3.5.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
+    checker-qual 3.39.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
     jul-to-slf4j 1.7.36: https://www.slf4j.org, MIT
     slf4j-api 1.7.36: https://www.slf4j.org, MIT
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index 2a4bd851dfe0c..dad8e756555ba 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -234,7 +234,7 @@ The text of each license is the standard Apache 2.0 license.
     curator-client 5.4.0:  https://github.com/apache/curator, Apache 2.0
     curator-framework 5.4.0:  https://github.com/apache/curator, Apache 2.0
     curator-recipes 5.4.0:  https://github.com/apache/curator, Apache 2.0
-    error_prone_annotations 2.11.0: https://github.com/google/error-prone, Apache 2.0
+    error_prone_annotations 2.22.0: https://github.com/google/error-prone, Apache 2.0
     failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0
     failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
     freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
@@ -367,6 +367,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     bcprov-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bctls-jdk15on 1.70: https://www.bouncycastle.org, MIT
     bcutil-jdk15on 1.70: https://www.bouncycastle.org, MIT
-    checker-qual 3.5.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
+    checker-qual 3.39.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
     jul-to-slf4j 1.7.36: https://www.slf4j.org, MIT
     slf4j-api 1.7.36: https://www.slf4j.org, MIT
diff --git a/pom.xml b/pom.xml
index 0e7a9bb3e90a3..3cf4204a598a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,8 @@
         
         <!-- 3rd party library versions -->
         <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>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-codec.version>1.15</commons-codec.version>
@@ -184,6 +186,16 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>${checker-qual.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>${error_prone_annotations.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -629,6 +641,12 @@
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
                 <version>${caffeine.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             
             <dependency>
@@ -645,6 +663,14 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>