This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 e9c58bcaa9b Refactor narayana dependencies into
shardingsphere-transaction-xa-narayana module (#36190)
e9c58bcaa9b is described below
commit e9c58bcaa9b5d1ccd14eae93036420216ff3d814
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Aug 6 09:52:38 2025 +0800
Refactor narayana dependencies into shardingsphere-transaction-xa-narayana
module (#36190)
* Refactor OpenGaussLogicalReplication
* Refactor narayana dependencies into
shardingsphere-transaction-xa-narayana module
---
examples/pom.xml | 31 ----------------------
.../transaction/type/xa/provider/narayana/pom.xml | 10 ++++---
pom.xml | 3 ---
test/e2e/fixture/pom.xml | 20 --------------
test/e2e/operation/transaction/pom.xml | 20 --------------
test/native/pom.xml | 24 -----------------
6 files changed, 6 insertions(+), 102 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 6ee4aef3f60..7471131a872 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -53,12 +53,7 @@
<jpa.version>1.0.0.Final</jpa.version>
<hibernate.version>5.4.24.Final</hibernate.version>
- <narayana.version>5.9.1.Final</narayana.version>
-
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
- <jboss-logging.version>3.2.1.Final</jboss-logging.version>
- <seata.version>1.6.1</seata.version>
-
<junit.version>5.11.2</junit.version>
<hamcrest.version>3.0</hamcrest.version>
@@ -253,32 +248,6 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</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>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
- </dependency>
- <dependency>
- <groupId>io.seata</groupId>
- <artifactId>seata-all</artifactId>
- <version>${seata.version}</version>
- </dependency>
<dependency>
<groupId>org.freemarker</groupId>
diff --git a/kernel/transaction/type/xa/provider/narayana/pom.xml
b/kernel/transaction/type/xa/provider/narayana/pom.xml
index 261f5e7e7f5..423c25a73aa 100644
--- a/kernel/transaction/type/xa/provider/narayana/pom.xml
+++ b/kernel/transaction/type/xa/provider/narayana/pom.xml
@@ -26,6 +26,12 @@
<artifactId>shardingsphere-transaction-xa-narayana</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <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>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -37,25 +43,21 @@
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
<version>${narayana.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts-integration</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>
<version>${jboss-logging.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 7ce6a43bc63..80851569498 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,9 +99,6 @@
<glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
<atomikos.version>6.0.0</atomikos.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>
<netty.version>4.1.121.Final</netty.version>
<bouncycastle.version>1.78.1</bouncycastle.version>
diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml
index 67a88b1fbc1..b1a6615244b 100644
--- a/test/e2e/fixture/pom.xml
+++ b/test/e2e/fixture/pom.xml
@@ -160,26 +160,6 @@
<artifactId>shardingsphere-transaction-xa-narayana</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</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>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
- </dependency>
</dependencies>
<build>
diff --git a/test/e2e/operation/transaction/pom.xml
b/test/e2e/operation/transaction/pom.xml
index 625806c68de..73cbe999540 100644
--- a/test/e2e/operation/transaction/pom.xml
+++ b/test/e2e/operation/transaction/pom.xml
@@ -168,26 +168,6 @@
<artifactId>transactions-jdbc</artifactId>
<version>${atomikos.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</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>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
- </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
diff --git a/test/native/pom.xml b/test/native/pom.xml
index f3af0a0f477..a65378feb9c 100644
--- a/test/native/pom.xml
+++ b/test/native/pom.xml
@@ -113,30 +113,6 @@
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</artifactId>
- <version>${narayana.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.jts</groupId>
- <artifactId>narayana-jts-integration</artifactId>
- <version>${narayana.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>${jboss-transaction-spi.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
