This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch 5.4.1-release
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/5.4.1-release by this push:
new 0c31811e961 Resolve dependencies conflict for guava (#28743)
0c31811e961 is described below
commit 0c31811e961bcec6deab002a3e0f2eba44f1f0d8
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Oct 13 07:42:18 2023 +0800
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
---
pom.xml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/pom.xml b/pom.xml
index 54942a47fde..2c819228684 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.16.0</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>
