Skip to content

Commit

Permalink
Migrate Narayana to 5.12.7.Final of the Jakarta variant
Browse files Browse the repository at this point in the history
  • Loading branch information
linghengqian committed Aug 7, 2023
1 parent 0052a44 commit 0ebf477
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 84 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ Apache ShardingSphere 提供 XA 事务,集成了 Narayana 的实现。

```xml
<properties>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
</properties>

<dependency>
Expand All @@ -38,23 +37,18 @@ Apache ShardingSphere 提供 XA 事务,集成了 Narayana 的实现。
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
</dependency>
```
## 操作步骤
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ Introducing Maven dependency

```xml
<properties>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
</properties>

<dependency>
Expand All @@ -38,23 +37,18 @@ Introducing Maven dependency
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
</dependency>
```
## Procedure
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ weight = 2

### jar 文件下载地址

- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)

请根据 `proxy` 版本下载对应 `shardingsphere-transaction-xa-narayana.jar` 文件。
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ Adding Narayana dependencies requires downloading the following jar files and ad

### jar file downloads

- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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)
- [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.
16 changes: 5 additions & 11 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@

<jpa.version>1.0.0.Final</jpa.version>
<hibernate.version>5.4.24.Final</hibernate.version>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>

<seata.version>1.6.1</seata.version>

Expand Down Expand Up @@ -252,22 +251,17 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down
15 changes: 4 additions & 11 deletions kernel/transaction/type/xa/provider/narayana/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
<name>${project.artifactId}</name>

<properties>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
</properties>

<dependencies>
Expand All @@ -41,22 +40,16 @@

<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down
14 changes: 4 additions & 10 deletions test/e2e/fixture/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<dockerfile.skip.build>true</dockerfile.skip.build>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -93,19 +92,14 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down
14 changes: 4 additions & 10 deletions test/e2e/operation/transaction/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
<maven.deploy.skip>true</maven.deploy.skip>

<atomikos.version>6.0.0</atomikos.version>
<narayana.version>6.0.0.Final</narayana.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<narayana.version>5.12.7.Final</narayana.version>
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -106,19 +105,14 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</artifactId>
<artifactId>narayana-jts-integration-jakarta</artifactId>
<version>${narayana.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${jboss-transaction-spi.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down

0 comments on commit 0ebf477

Please sign in to comment.