This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e9c1603236c Bump pgjbdc version to prevent CVE from being passed in
Proxy (#30369)
e9c1603236c is described below
commit e9c1603236c66247abe6b794e31483db36650dd1
Author: Ling Hengqian <[email protected]>
AuthorDate: Sat Mar 2 13:32:25 2024 +0800
Bump pgjbdc version to prevent CVE from being passed in Proxy (#30369)
---
distribution/proxy/src/main/release-docs/LICENSE | 2 +-
.../shardingsphere-jdbc/special-api/transaction/narayana.cn.md | 4 ++--
.../shardingsphere-jdbc/special-api/transaction/narayana.en.md | 4 ++--
.../shardingsphere-jdbc/yaml-config/rules/transaction.cn.md | 10 +++++-----
.../shardingsphere-jdbc/yaml-config/rules/transaction.en.md | 10 +++++-----
.../dependencies-download/add_Narayana_dependency.cn.md | 10 +++++-----
.../dependencies-download/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 b5694f57b3f..8ce7cb4f8a9 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 e32d14d14e7..a010bbb9d49 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
<properties>
- <narayana.version>5.12.4.Final</narayana.version>
- <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
+ <narayana.version>5.12.7.Final</narayana.version>
+ <jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
</properties>
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 fd5c96bcfb9..9015a1e86b2 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
<properties>
- <narayana.version>5.12.4.Final</narayana.version>
- <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
+ <narayana.version>5.12.7.Final</narayana.version>
+ <jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
</properties>
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 e602b0d100a..ca12ed48de0 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 c48aa65da90..ae1894ac244 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 24aa04948d8..08bce925347 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 64aed2321f4..3a7db12f2cb 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 b7cc5d9889a..8c0320c50e4 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>8.0.31</mysql-connector-java.version>
- <postgresql.version>42.4.3</postgresql.version>
+ <postgresql.version>42.7.2</postgresql.version>
<h2.version>2.2.224</h2.version>
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.2.13</logback.version>
@@ -64,7 +64,7 @@
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<freemarker.version>2.3.31</freemarker.version>
- <snakeyaml.version>1.33</snakeyaml.version>
+ <snakeyaml.version>2.2</snakeyaml.version>
<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
diff --git a/pom.xml b/pom.xml
index 820a82c6cb7..7ce3705bfdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,8 +91,8 @@
<glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
<atomikos.version>6.0.0</atomikos.version>
- <narayana.version>5.12.4.Final</narayana.version>
-
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
+ <narayana.version>5.12.7.Final</narayana.version>
+
<jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
<seata.version>2.0.0</seata.version>
@@ -117,7 +117,7 @@
<lombok.version>1.18.30</lombok.version>
- <postgresql.version>42.4.3</postgresql.version>
+ <postgresql.version>42.7.2</postgresql.version>
<mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>
<hbase.client.version>1.7.1</hbase.client.version>
