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
commit 73e063d6fa16c0decc6ef4ccfe8497fab27bb3bf
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Oct 12 23:16:43 2023 +0800
Upgrade dependencies versions (#28740)
* 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
---
.../proxy-native/src/main/release-docs/LICENSE | 52 +++++++++++-----------
distribution/proxy/src/main/release-docs/LICENSE | 52 +++++++++++-----------
examples/pom.xml | 2 +-
kernel/sql-federation/core/pom.xml | 4 ++
pom.xml | 24 ++++++++--
.../readonly/PostgreSQLSetReadOnlyTestCase.java | 2 +-
test/util/pom.xml | 5 ---
7 files changed, 78 insertions(+), 63 deletions(-)
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE
b/distribution/proxy-native/src/main/release-docs/LICENSE
index db587cc1a8d..2a4bd851dfe 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -239,16 +239,16 @@ The text of each license is the standard Apache 2.0
license.
failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
groovy 4.0.10: https://groovy.apache.org/, Apache 2.0
- grpc-api 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-context 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-core 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-grpclb 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-netty 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-protobuf 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-protobuf-lite 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-stub 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-api 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-context 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-core 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-grpclb 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-netty 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-protobuf 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-protobuf-lite 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-stub 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
gson 2.9.1: https://github.com/google/gson, Apache 2.0
- guava 30.0-jre: https://github.com/google/guava, Apache 2.0
+ guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0
HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0
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
@@ -263,20 +263,25 @@ The text of each license is the standard Apache 2.0
license.
jetcd-common 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-core 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-grpc 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
- json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
- json-smart 2.4.7: https://www.minidev.net/, Apache 2.0
+ json-path 2.8.0: https://github.com/jayway/JsonPath, Apache 2.0
+ json-smart 2.4.10: https://www.minidev.net/, Apache 2.0
json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache
2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-buffer 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-http 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-http2 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-socks 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-common 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http2 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-socks 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-handler-proxy 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport-classes-epoll 4.1.99.Final: https://github.com/netty,
Apache 2.0
+ netty-transport-native-epoll 4.1.99.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.99.Final-linux-x86_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-unix-common 4.1.99.Final: https://github.com/netty,
Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-linux-aarch_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-linux-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
@@ -284,11 +289,6 @@ The text of each license is the standard Apache 2.0
license.
netty-tcnative-boringssl-static 2.0.59.Final-osx-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-windows-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-classes 2.0.59.Final:
https://github.com/netty/netty-tcnative, Apache 2.0
- netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty,
Apache 2.0
- netty-transport-native-epoll 4.1.90.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.90.Final-linux-x86_64:
https://github.com/netty, Apache 2.0
- netty-transport-native-unix-common 4.1.90.Final: https://github.com/netty,
Apache 2.0
perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.9.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
@@ -325,7 +325,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
commons-compiler 3.1.8: https://github.com/janino-compiler/janino,
BSD-3-Clause
janino 3.1.9: https://github.com/janino-compiler/janino, BSD-3-Clause
opengauss-jdbc 3.1.0-og:
https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
- postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
+ postgresql 42.4.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
protobuf-java 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
protobuf-java-util 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
jts-io-common 1.19.0: https://github.com/locationtech/jts, EDL 1.0
diff --git a/distribution/proxy/src/main/release-docs/LICENSE
b/distribution/proxy/src/main/release-docs/LICENSE
index db587cc1a8d..2a4bd851dfe 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -239,16 +239,16 @@ The text of each license is the standard Apache 2.0
license.
failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
groovy 4.0.10: https://groovy.apache.org/, Apache 2.0
- grpc-api 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-context 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-core 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-grpclb 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-netty 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-protobuf 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-protobuf-lite 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
- grpc-stub 1.51.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-api 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-context 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-core 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-grpclb 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-netty 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-protobuf 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-protobuf-lite 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
+ grpc-stub 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0
gson 2.9.1: https://github.com/google/gson, Apache 2.0
- guava 30.0-jre: https://github.com/google/guava, Apache 2.0
+ guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0
HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0
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
@@ -263,20 +263,25 @@ The text of each license is the standard Apache 2.0
license.
jetcd-common 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-core 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-grpc 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0
- json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
- json-smart 2.4.7: https://www.minidev.net/, Apache 2.0
+ json-path 2.8.0: https://github.com/jayway/JsonPath, Apache 2.0
+ json-smart 2.4.10: https://www.minidev.net/, Apache 2.0
json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache
2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-buffer 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-http 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-http2 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-codec-socks 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-common 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http2 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-socks 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-handler-proxy 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport-classes-epoll 4.1.99.Final: https://github.com/netty,
Apache 2.0
+ netty-transport-native-epoll 4.1.99.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.99.Final-linux-x86_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-unix-common 4.1.99.Final: https://github.com/netty,
Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-linux-aarch_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-linux-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
@@ -284,11 +289,6 @@ The text of each license is the standard Apache 2.0
license.
netty-tcnative-boringssl-static 2.0.59.Final-osx-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-boringssl-static 2.0.59.Final-windows-x86_64:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-tcnative-classes 2.0.59.Final:
https://github.com/netty/netty-tcnative, Apache 2.0
- netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
- netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty,
Apache 2.0
- netty-transport-native-epoll 4.1.90.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.90.Final-linux-x86_64:
https://github.com/netty, Apache 2.0
- netty-transport-native-unix-common 4.1.90.Final: https://github.com/netty,
Apache 2.0
perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.9.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
@@ -325,7 +325,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
commons-compiler 3.1.8: https://github.com/janino-compiler/janino,
BSD-3-Clause
janino 3.1.9: https://github.com/janino-compiler/janino, BSD-3-Clause
opengauss-jdbc 3.1.0-og:
https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
- postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
+ postgresql 42.4.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
protobuf-java 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
protobuf-java-util 3.21.12:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
jts-io-common 1.19.0: https://github.com/locationtech/jts, EDL 1.0
diff --git a/examples/pom.xml b/examples/pom.xml
index e618529491e..6c46e54317a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -42,7 +42,7 @@
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<hikari-cp.version>3.4.2</hikari-cp.version>
<mysql-connector-java.version>5.1.49</mysql-connector-java.version>
- <postgresql.version>42.4.1</postgresql.version>
+ <postgresql.version>42.4.3</postgresql.version>
<h2.version>2.2.224</h2.version>
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.2.10</logback.version>
diff --git a/kernel/sql-federation/core/pom.xml
b/kernel/sql-federation/core/pom.xml
index d5bab530c24..813fe0ea35c 100644
--- a/kernel/sql-federation/core/pom.xml
+++ b/kernel/sql-federation/core/pom.xml
@@ -70,6 +70,10 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ </dependency>
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
diff --git a/pom.xml b/pom.xml
index fd21b6a66ab..9cbd9c0b316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<sonar.exclusions>**/autogen/**/*</sonar.exclusions>
<!-- 3rd party library versions -->
- <guava.version>30.0-jre</guava.version>
+ <guava.version>32.1.2-jre</guava.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>
@@ -74,6 +74,7 @@
<snakeyaml.version>1.33</snakeyaml.version>
<gson.version>2.9.1</gson.version>
<jackson.version>2.14.0</jackson.version>
+ <json-path.version>2.8.0</json-path.version>
<groovy.version>4.0.10</groovy.version>
<freemarker.version>2.3.31</freemarker.version>
<caffeine.version>2.9.3</caffeine.version>
@@ -84,7 +85,7 @@
<calcite.version>1.35.0</calcite.version>
<immutables.version>2.9.3</immutables.version>
- <netty.version>4.1.90.Final</netty.version>
+ <netty.version>4.1.99.Final</netty.version>
<bouncycastle.version>1.70</bouncycastle.version>
<javax.transaction.version>1.1</javax.transaction.version>
@@ -92,7 +93,7 @@
<zookeeper.version>3.8.1</zookeeper.version>
<curator.version>5.4.0</curator.version>
<jetcd.version>0.7.5</jetcd.version>
- <grpc.version>1.51.0</grpc.version>
+ <grpc.version>1.58.0</grpc.version>
<elasticjob.version>3.0.3</elasticjob.version>
@@ -101,7 +102,7 @@
<lombok.version>1.18.30</lombok.version>
- <postgresql.version>42.4.1</postgresql.version>
+ <postgresql.version>42.4.3</postgresql.version>
<opengauss.version>3.1.0-og</opengauss.version>
<mysql-connector-java.version>5.1.49</mysql-connector-java.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
@@ -234,6 +235,11 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>${json-path.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -270,6 +276,12 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>${calcite.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
@@ -361,6 +373,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
index 251868f24bb..ad25228299d 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
@@ -52,7 +52,7 @@ public final class PostgreSQLSetReadOnlyTestCase extends
SetReadOnlyTestCase {
connection2.setReadOnly(true);
assertQueryBalance(connection2);
executeWithLog(connection2, "update account set balance = 100
where id = 2;");
- log.info("Using the driver of postgresql:42.4.1 expect to update
successfully.");
+ log.info("Using the driver of postgresql:42.4.3 expect to update
successfully.");
}
}
}
diff --git a/test/util/pom.xml b/test/util/pom.xml
index 61d15d40740..adba5c9c8f1 100644
--- a/test/util/pom.xml
+++ b/test/util/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-test-util</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <json-path.version>2.4.0</json-path.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -64,7 +60,6 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>${json-path.version}</version>
</dependency>
</dependencies>
</project>
