Skip to content

Commit

Permalink
Upgrade dependencies versions (apache#28740)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
terrymanu authored Oct 12, 2023
1 parent 0782927 commit 41469c0
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 63 deletions.
52 changes: 26 additions & 26 deletions distribution/proxy-native/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -263,32 +263,32 @@ 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
netty-tcnative-boringssl-static 2.0.59.Final-osx-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
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
Expand Down Expand Up @@ -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
Expand Down
52 changes: 26 additions & 26 deletions distribution/proxy/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -263,32 +263,32 @@ 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
netty-tcnative-boringssl-static 2.0.59.Final-osx-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions kernel/sql-federation/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 20 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -84,15 +85,15 @@

<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>

<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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private void assertSetReadOnly() throws SQLException {
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.");
}
}
}
5 changes: 0 additions & 5 deletions test/util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -64,7 +60,6 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json-path.version}</version>
</dependency>
</dependencies>
</project>

0 comments on commit 41469c0

Please sign in to comment.