Skip to content

Commit 38f7e10

Browse files
committed
Remove incorrect changes to the Example module
1 parent 38b6d8e commit 38f7e10

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ weight = 2
1515
- [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)
1616
- [jboss-logging-3.4.3.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar)
1717
- [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)
18+
- [narayana-jta-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.12.7.Final/narayana-jta-jakarta-5.12.7.Final.jar)
19+
- [narayana-jts-integration-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.12.7.Final/narayana-jts-integration-jakarta-5.12.7.Final.jar)
2020
- [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
2121

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Adding Narayana dependencies requires downloading the following jar files and ad
1515
- [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)
1616
- [jboss-logging-3.4.3.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar)
1717
- [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)
18+
- [narayana-jta-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.12.7.Final/narayana-jta-jakarta-5.12.7.Final.jar)
19+
- [narayana-jts-integration-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.12.7.Final/narayana-jts-integration-jakarta-5.12.7.Final.jar)
2020
- [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
2121

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

examples/pom.xml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@
5555

5656
<jpa.version>1.0.0.Final</jpa.version>
5757
<hibernate.version>5.4.24.Final</hibernate.version>
58-
<narayana.version>5.12.7.Final</narayana.version>
59-
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
58+
<narayana.version>5.9.1.Final</narayana.version>
59+
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
60+
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
6061

6162
<seata.version>1.6.1</seata.version>
6263

@@ -251,17 +252,22 @@
251252
<artifactId>mybatis-spring-boot-starter</artifactId>
252253
<version>${mybatis-spring-boot.version}</version>
253254
</dependency>
254-
255+
255256
<dependency>
256257
<groupId>org.jboss.narayana.jta</groupId>
257-
<artifactId>narayana-jta-jakarta</artifactId>
258+
<artifactId>jta</artifactId>
258259
<version>${narayana.version}</version>
259260
</dependency>
260261
<dependency>
261262
<groupId>org.jboss.narayana.jts</groupId>
262-
<artifactId>narayana-jts-integration-jakarta</artifactId>
263+
<artifactId>narayana-jts-integration</artifactId>
263264
<version>${narayana.version}</version>
264265
</dependency>
266+
<dependency>
267+
<groupId>org.jboss</groupId>
268+
<artifactId>jboss-transaction-spi</artifactId>
269+
<version>${jboss-transaction-spi.version}</version>
270+
</dependency>
265271
<dependency>
266272
<groupId>org.jboss.logging</groupId>
267273
<artifactId>jboss-logging</artifactId>
@@ -344,12 +350,12 @@
344350
<jdk>[11,)</jdk>
345351
</activation>
346352
<properties>
347-
<annotation-api.version>2.0.0</annotation-api.version>
353+
<annotation-api.version>1.3.2</annotation-api.version>
348354
</properties>
349355
<dependencies>
350356
<dependency>
351-
<groupId>jakarta.annotation</groupId>
352-
<artifactId>jakarta.annotation-api</artifactId>
357+
<groupId>javax.annotation</groupId>
358+
<artifactId>javax.annotation-api</artifactId>
353359
<version>${annotation-api.version}</version>
354360
</dependency>
355361
</dependencies>

0 commit comments

Comments
 (0)