Skip to content

Commit 32089fa

Browse files
committed
Migrate Narayana to 5.12.7.Final of the Jakarta variant
1 parent 0052a44 commit 32089fa

File tree

8 files changed

+35
-76
lines changed

8 files changed

+35
-76
lines changed

docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Apache ShardingSphere 提供 XA 事务,集成了 Narayana 的实现。
1313

1414
```xml
1515
<properties>
16-
<narayana.version>6.0.0.Final</narayana.version>
17-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
16+
<narayana.version>5.12.7.Final</narayana.version>
1817
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
1918
</properties>
2019

@@ -38,23 +37,18 @@ Apache ShardingSphere 提供 XA 事务,集成了 Narayana 的实现。
3837
</dependency>
3938
<dependency>
4039
<groupId>org.jboss.narayana.jta</groupId>
41-
<artifactId>jta</artifactId>
40+
<artifactId>narayana-jta-jakarta</artifactId>
4241
<version>${narayana.version}</version>
4342
</dependency>
4443
<dependency>
45-
<groupId>org.jboss.narayana.jts</groupId>
46-
<artifactId>narayana-jts-integration</artifactId>
47-
<version>${narayana.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.jboss</groupId>
51-
<artifactId>jboss-transaction-spi</artifactId>
52-
<version>${jboss-transaction-spi.version}</version>
44+
<groupId>org.jboss.narayana.jts</groupId>
45+
<artifactId>narayana-jts-integration-jakarta</artifactId>
46+
<version>${narayana.version}</version>
5347
</dependency>
5448
<dependency>
55-
<groupId>org.jboss.logging</groupId>
56-
<artifactId>jboss-logging</artifactId>
57-
<version>${jboss-logging.version}</version>
49+
<groupId>org.jboss.logging</groupId>
50+
<artifactId>jboss-logging</artifactId>
51+
<version>${jboss-logging.version}</version>
5852
</dependency>
5953
```
6054
## 操作步骤

docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Introducing Maven dependency
1313

1414
```xml
1515
<properties>
16-
<narayana.version>6.0.0.Final</narayana.version>
17-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
16+
<narayana.version>5.12.7.Final</narayana.version>
1817
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
1918
</properties>
2019

@@ -38,23 +37,18 @@ Introducing Maven dependency
3837
</dependency>
3938
<dependency>
4039
<groupId>org.jboss.narayana.jta</groupId>
41-
<artifactId>jta</artifactId>
40+
<artifactId>narayana-jta-jakarta</artifactId>
4241
<version>${narayana.version}</version>
4342
</dependency>
4443
<dependency>
45-
<groupId>org.jboss.narayana.jts</groupId>
46-
<artifactId>narayana-jts-integration</artifactId>
47-
<version>${narayana.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.jboss</groupId>
51-
<artifactId>jboss-transaction-spi</artifactId>
52-
<version>${jboss-transaction-spi.version}</version>
44+
<groupId>org.jboss.narayana.jts</groupId>
45+
<artifactId>narayana-jts-integration-jakarta</artifactId>
46+
<version>${narayana.version}</version>
5347
</dependency>
5448
<dependency>
55-
<groupId>org.jboss.logging</groupId>
56-
<artifactId>jboss-logging</artifactId>
57-
<version>${jboss-logging.version}</version>
49+
<groupId>org.jboss.logging</groupId>
50+
<artifactId>jboss-logging</artifactId>
51+
<version>${jboss-logging.version}</version>
5852
</dependency>
5953
```
6054
## Procedure

docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ weight = 2
99

1010
### jar 文件下载地址
1111

12-
- [arjuna-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/6.0.0.Final/arjuna-6.0.0.Final.jar)
13-
- [common-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/6.0.0.Final/common-6.0.0.Final.jar)
1412
- [jakarta.activation-api-2.0.1.jar](https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.0.1/jakarta.activation-api-2.0.1.jar)
1513
- [jakarta.xml.bind-api-3.0.1.jar](https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/3.0.1/jakarta.xml.bind-api-3.0.1.jar)
1614
- [jaxb-core-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/3.0.2/jaxb-core-3.0.2.jar)
1715
- [jaxb-impl-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/3.0.2/jaxb-impl-3.0.2.jar)
1816
- [jboss-logging-3.5.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.5.0.Final/jboss-logging-3.5.0.Final.jar)
19-
- [jboss-transaction-spi-8.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/8.0.0.Final/jboss-transaction-spi-8.0.0.Final.jar)
20-
- [jta-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/6.0.0.Final/jta-6.0.0.Final.jar)
21-
- [narayana-jts-integration-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/6.0.0.Final/narayana-jts-integration-6.0.0.Final.jar)
17+
- [jboss-transaction-spi-jakarta-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi-jakarta/7.6.1.Final/jboss-transaction-spi-jakarta-7.6.1.Final.jar)
18+
- [narayana-jta-jakarta-5.13.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.13.1.Final/narayana-jta-jakarta-5.13.1.Final.jar)
19+
- [narayana-jts-integration-jakarta-5.13.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.13.1.Final/narayana-jts-integration-jakarta-5.13.1.Final.jar)
2220
- [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
2321

2422
请根据 `proxy` 版本下载对应 `shardingsphere-transaction-xa-narayana.jar` 文件。

docs/document/content/user-manual/shardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ Adding Narayana dependencies requires downloading the following jar files and ad
99

1010
### jar file downloads
1111

12-
- [arjuna-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/6.0.0.Final/arjuna-6.0.0.Final.jar)
13-
- [common-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/6.0.0.Final/common-6.0.0.Final.jar)
1412
- [jakarta.activation-api-2.0.1.jar](https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.0.1/jakarta.activation-api-2.0.1.jar)
1513
- [jakarta.xml.bind-api-3.0.1.jar](https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/3.0.1/jakarta.xml.bind-api-3.0.1.jar)
1614
- [jaxb-core-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/3.0.2/jaxb-core-3.0.2.jar)
1715
- [jaxb-impl-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/3.0.2/jaxb-impl-3.0.2.jar)
1816
- [jboss-logging-3.5.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.5.0.Final/jboss-logging-3.5.0.Final.jar)
19-
- [jboss-transaction-spi-8.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/8.0.0.Final/jboss-transaction-spi-8.0.0.Final.jar)
20-
- [jta-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/6.0.0.Final/jta-6.0.0.Final.jar)
21-
- [narayana-jts-integration-6.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/6.0.0.Final/narayana-jts-integration-6.0.0.Final.jar)
17+
- [jboss-transaction-spi-jakarta-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi-jakarta/7.6.1.Final/jboss-transaction-spi-jakarta-7.6.1.Final.jar)
18+
- [narayana-jta-jakarta-5.13.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.13.1.Final/narayana-jta-jakarta-5.13.1.Final.jar)
19+
- [narayana-jts-integration-jakarta-5.13.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.13.1.Final/narayana-jts-integration-jakarta-5.13.1.Final.jar)
2220
- [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
2321

2422
Please download the corresponding `shardingsphere-transaction-xa-narayana.jar` file according to the `proxy` version.

examples/pom.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555

5656
<jpa.version>1.0.0.Final</jpa.version>
5757
<hibernate.version>5.4.24.Final</hibernate.version>
58-
<narayana.version>6.0.0.Final</narayana.version>
59-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
58+
<narayana.version>5.12.7.Final</narayana.version>
6059
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
6160

6261
<seata.version>1.6.1</seata.version>
@@ -252,22 +251,17 @@
252251
<artifactId>mybatis-spring-boot-starter</artifactId>
253252
<version>${mybatis-spring-boot.version}</version>
254253
</dependency>
255-
254+
256255
<dependency>
257256
<groupId>org.jboss.narayana.jta</groupId>
258-
<artifactId>jta</artifactId>
257+
<artifactId>narayana-jta-jakarta</artifactId>
259258
<version>${narayana.version}</version>
260259
</dependency>
261260
<dependency>
262261
<groupId>org.jboss.narayana.jts</groupId>
263-
<artifactId>narayana-jts-integration</artifactId>
262+
<artifactId>narayana-jts-integration-jakarta</artifactId>
264263
<version>${narayana.version}</version>
265264
</dependency>
266-
<dependency>
267-
<groupId>org.jboss</groupId>
268-
<artifactId>jboss-transaction-spi</artifactId>
269-
<version>${jboss-transaction-spi.version}</version>
270-
</dependency>
271265
<dependency>
272266
<groupId>org.jboss.logging</groupId>
273267
<artifactId>jboss-logging</artifactId>

kernel/transaction/type/xa/provider/narayana/pom.xml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<name>${project.artifactId}</name>
2828

2929
<properties>
30-
<narayana.version>6.0.0.Final</narayana.version>
31-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
30+
<narayana.version>5.12.7.Final</narayana.version>
3231
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
3332
</properties>
3433

@@ -41,22 +40,16 @@
4140

4241
<dependency>
4342
<groupId>org.jboss.narayana.jta</groupId>
44-
<artifactId>jta</artifactId>
43+
<artifactId>narayana-jta-jakarta</artifactId>
4544
<version>${narayana.version}</version>
4645
<scope>provided</scope>
4746
</dependency>
4847
<dependency>
4948
<groupId>org.jboss.narayana.jts</groupId>
50-
<artifactId>narayana-jts-integration</artifactId>
49+
<artifactId>narayana-jts-integration-jakarta</artifactId>
5150
<version>${narayana.version}</version>
5251
<scope>provided</scope>
5352
</dependency>
54-
<dependency>
55-
<groupId>org.jboss</groupId>
56-
<artifactId>jboss-transaction-spi</artifactId>
57-
<version>${jboss-transaction-spi.version}</version>
58-
<scope>provided</scope>
59-
</dependency>
6053
<dependency>
6154
<groupId>org.jboss.logging</groupId>
6255
<artifactId>jboss-logging</artifactId>

test/e2e/fixture/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<properties>
3030
<maven.deploy.skip>true</maven.deploy.skip>
3131
<dockerfile.skip.build>true</dockerfile.skip.build>
32-
<narayana.version>6.0.0.Final</narayana.version>
33-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
32+
<narayana.version>5.12.7.Final</narayana.version>
3433
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
3534
</properties>
3635

@@ -93,19 +92,14 @@
9392
</dependency>
9493
<dependency>
9594
<groupId>org.jboss.narayana.jta</groupId>
96-
<artifactId>jta</artifactId>
95+
<artifactId>narayana-jta-jakarta</artifactId>
9796
<version>${narayana.version}</version>
9897
</dependency>
9998
<dependency>
10099
<groupId>org.jboss.narayana.jts</groupId>
101-
<artifactId>narayana-jts-integration</artifactId>
100+
<artifactId>narayana-jts-integration-jakarta</artifactId>
102101
<version>${narayana.version}</version>
103102
</dependency>
104-
<dependency>
105-
<groupId>org.jboss</groupId>
106-
<artifactId>jboss-transaction-spi</artifactId>
107-
<version>${jboss-transaction-spi.version}</version>
108-
</dependency>
109103
<dependency>
110104
<groupId>org.jboss.logging</groupId>
111105
<artifactId>jboss-logging</artifactId>

test/e2e/operation/transaction/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
<maven.deploy.skip>true</maven.deploy.skip>
3131

3232
<atomikos.version>6.0.0</atomikos.version>
33-
<narayana.version>6.0.0.Final</narayana.version>
34-
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
33+
<narayana.version>5.12.7.Final</narayana.version>
3534
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
3635
</properties>
3736

@@ -106,19 +105,14 @@
106105
</dependency>
107106
<dependency>
108107
<groupId>org.jboss.narayana.jta</groupId>
109-
<artifactId>jta</artifactId>
108+
<artifactId>narayana-jta-jakarta</artifactId>
110109
<version>${narayana.version}</version>
111110
</dependency>
112111
<dependency>
113112
<groupId>org.jboss.narayana.jts</groupId>
114-
<artifactId>narayana-jts-integration</artifactId>
113+
<artifactId>narayana-jts-integration-jakarta</artifactId>
115114
<version>${narayana.version}</version>
116115
</dependency>
117-
<dependency>
118-
<groupId>org.jboss</groupId>
119-
<artifactId>jboss-transaction-spi</artifactId>
120-
<version>${jboss-transaction-spi.version}</version>
121-
</dependency>
122116
<dependency>
123117
<groupId>org.jboss.logging</groupId>
124118
<artifactId>jboss-logging</artifactId>

0 commit comments

Comments
 (0)