From 99aa29e6ccbf316eebf2fd3e688db3a59bcb2716 Mon Sep 17 00:00:00 2001 From: linghengqian Date: Fri, 1 Mar 2024 21:47:43 +0800 Subject: [PATCH] Bump pgjbdc version to prevent CVE from being passed in Proxy --- distribution/proxy/src/main/release-docs/LICENSE | 2 +- .../special-api/transaction/narayana.cn.md | 4 ++-- .../special-api/transaction/narayana.en.md | 4 ++-- .../yaml-config/rules/transaction.cn.md | 10 +++++----- .../yaml-config/rules/transaction.en.md | 10 +++++----- .../add_Narayana_dependency.cn.md | 10 +++++----- .../add_Narayana_dependency.en.md | 10 +++++----- examples/pom.xml | 4 ++-- pom.xml | 6 +++--- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index b5694f57b3fd4..8ce7cb4f8a9b8 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -332,7 +332,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. commons-compiler 3.1.9: 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.3: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause + postgresql 42.7.2: 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/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md index e32d14d14e74c..a010bbb9d496d 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md @@ -13,8 +13,8 @@ Apache ShardingSphere 提供 XA 事务，集成了 Narayana 的实现。 ```xml - 5.12.4.Final - 7.6.0.Final + 5.12.7.Final + 7.6.1.Final 3.2.1.Final diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md index fd5c96bcfb92a..9015a1e86b21a 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md @@ -13,8 +13,8 @@ Introducing Maven dependency ```xml - 5.12.4.Final - 7.6.0.Final + 5.12.7.Final + 7.6.1.Final 3.2.1.Final diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.cn.md index e602b0d100a89..ca12ed48de020 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.cn.md @@ -38,14 +38,14 @@ transaction: 手动添加 Narayana 相关依赖： ``` -jta-5.12.4.Final.jar -arjuna-5.12.4.Final.jar -common-5.12.4.Final.jar +jta-5.12.7.Final.jar +arjuna-5.12.7.Final.jar +common-5.12.7.Final.jar jboss-connector-api_1.7_spec-1.0.0.Final.jar jboss-logging-3.2.1.Final.jar jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar -jboss-transaction-spi-7.6.0.Final.jar -narayana-jts-integration-5.12.4.Final.jar +jboss-transaction-spi-7.6.1.Final.jar +narayana-jts-integration-5.12.7.Final.jar shardingsphere-transaction-xa-narayana-x.x.x-SNAPSHOT.jar ``` diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.en.md index c48aa65da909a..ae1894ac2448a 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/transaction.en.md @@ -38,14 +38,14 @@ transaction: To manually add Narayana-related dependencies: ``` -jta-5.12.4.Final.jar -arjuna-5.12.4.Final.jar -common-5.12.4.Final.jar +jta-5.12.7.Final.jar +arjuna-5.12.7.Final.jar +common-5.12.7.Final.jar jboss-connector-api_1.7_spec-1.0.0.Final.jar jboss-logging-3.2.1.Final.jar jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar -jboss-transaction-spi-7.6.0.Final.jar -narayana-jts-integration-5.12.4.Final.jar +jboss-transaction-spi-7.6.1.Final.jar +narayana-jts-integration-5.12.7.Final.jar shardingsphere-transaction-xa-narayana-x.x.x-SNAPSHOT.jar ``` diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md index 24aa04948d8cd..08bce92534722 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md @@ -9,14 +9,14 @@ weight = 2 ### jar 文件下载地址 -- [arjuna-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.4.Final/arjuna-5.12.4.Final.jar) -- [common-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.4.Final/common-5.12.4.Final.jar) +- [arjuna-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.7.Final/arjuna-5.12.7.Final.jar) +- [common-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.7.Final/common-5.12.7.Final.jar) - [jboss-connector-api_1.7_spec-1.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/resource/jboss-connector-api_1.7_spec/1.0.0.Final/jboss-connector-api_1.7_spec-1.0.0.Final.jar) - [jboss-logging-3.2.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar) - [jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Alpha3/jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar) -- [jboss-transaction-spi-7.6.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.0.Final/jboss-transaction-spi-7.6.0.Final.jar) -- [jta-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.4.Final/jta-5.12.4.Final.jar) -- [narayana-jts-integration-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.4.Final/narayana-jts-integration-5.12.4.Final.jar) +- [jboss-transaction-spi-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.1.Final/jboss-transaction-spi-7.6.1.Final.jar) +- [jta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.7.Final/jta-5.12.7.Final.jar) +- [narayana-jts-integration-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.7.Final/narayana-jts-integration-5.12.7.Final.jar) - [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana) 请根据 `proxy` 版本下载对应 `shardingsphere-transaction-xa-narayana.jar` 文件。 diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md index 64aed2321f429..3a7db12f2cbe9 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md @@ -9,14 +9,14 @@ Adding Narayana dependencies requires downloading the following jar files and ad ### jar file downloads -- [arjuna-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.4.Final/arjuna-5.12.4.Final.jar) -- [common-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.4.Final/common-5.12.4.Final.jar) +- [arjuna-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.7.Final/arjuna-5.12.7.Final.jar) +- [common-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.7.Final/common-5.12.7.Final.jar) - [jboss-connector-api_1.7_spec-1.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/resource/jboss-connector-api_1.7_spec/1.0.0.Final/jboss-connector-api_1.7_spec-1.0.0.Final.jar) - [jboss-logging-3.2.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar) - [jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Alpha3/jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar) -- [jboss-transaction-spi-7.6.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.0.Final/jboss-transaction-spi-7.6.0.Final.jar) -- [jta-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.4.Final/jta-5.12.4.Final.jar) -- [narayana-jts-integration-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.4.Final/narayana-jts-integration-5.12.4.Final.jar) +- [jboss-transaction-spi-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.1.Final/jboss-transaction-spi-7.6.1.Final.jar) +- [jta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.7.Final/jta-5.12.7.Final.jar) +- [narayana-jts-integration-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.7.Final/narayana-jts-integration-5.12.7.Final.jar) - [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana) Please download the corresponding `shardingsphere-transaction-xa-narayana.jar` file according to the `proxy` version. diff --git a/examples/pom.xml b/examples/pom.xml index b7cc5d9889a98..8c0320c50e4c9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -42,7 +42,7 @@ 2.3.12.RELEASE 3.4.2 8.0.31 - 42.4.3 + 42.7.2 2.2.224 1.7.7 1.2.13 @@ -64,7 +64,7 @@ 3.2.0 3.2.1 2.3.31 - 1.33 + 2.2 1.2.5 ${java.home}/../bin/javadoc diff --git a/pom.xml b/pom.xml index 820a82c6cb7a7..7ce3705bfdb82 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,8 @@ 2.3.9 6.0.0 - 5.12.4.Final - 7.6.0.Final + 5.12.7.Final + 7.6.1.Final 3.2.1.Final 2.0.0 @@ -117,7 +117,7 @@ 1.18.30 - 42.4.3 + 42.7.2 8.0.31 6.1.7.jre8-preview 1.7.1