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 4190d879a8c Add transaction profiles (#36170) 4190d879a8c is described below commit 4190d879a8cb5f08ef44f325a10813b18c247c91 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Mon Aug 4 20:28:40 2025 +0800 Add transaction profiles (#36170) * Update LICENSE * Add transaction profiles * Add transaction profiles * Add transaction profiles * Add transaction profiles * Add transaction profiles * Add transaction profiles --- distribution/jdbc/pom.xml | 51 +++++++++++++++++++++------ distribution/proxy-native/pom.xml | 40 +++++++++++++++++++++ distribution/proxy/pom.xml | 40 +++++++++++++++++++++ examples/pom.xml | 5 +++ kernel/transaction/type/base/seata-at/pom.xml | 23 +++++++----- kernel/transaction/type/xa/core/pom.xml | 7 ++-- test/e2e/fixture/pom.xml | 5 +++ test/e2e/operation/transaction/pom.xml | 16 ++++++--- test/native/pom.xml | 6 ++++ 9 files changed, 165 insertions(+), 28 deletions(-) diff --git a/distribution/jdbc/pom.xml b/distribution/jdbc/pom.xml index 3a2f0424237..122f98f7371 100644 --- a/distribution/jdbc/pom.xml +++ b/distribution/jdbc/pom.xml @@ -39,17 +39,6 @@ <artifactId>shardingsphere-database-time-service</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-transaction-xa-narayana</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-transaction-base-seata-at</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <profiles> @@ -140,6 +129,12 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-standalone-mode-repository-memory</artifactId> @@ -333,6 +328,40 @@ </dependencies> </profile> + <profile> + <id>transaction-atomikos</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-narayana</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-narayana</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-seata</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-base-seata-at</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>mode-repo-memory</id> <dependencies> diff --git a/distribution/proxy-native/pom.xml b/distribution/proxy-native/pom.xml index 580db1db1cf..2b1a74cf4b8 100644 --- a/distribution/proxy-native/pom.xml +++ b/distribution/proxy-native/pom.xml @@ -228,6 +228,12 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-standalone-mode-repository-memory</artifactId> @@ -480,6 +486,40 @@ </dependencies> </profile> + <profile> + <id>transaction-atomikos</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-narayana</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-narayana</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-seata</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-base-seata-at</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>mode-repo-memory</id> <dependencies> diff --git a/distribution/proxy/pom.xml b/distribution/proxy/pom.xml index 861f4019cbd..6dd72eb8cf6 100644 --- a/distribution/proxy/pom.xml +++ b/distribution/proxy/pom.xml @@ -264,6 +264,12 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-standalone-mode-repository-memory</artifactId> @@ -516,6 +522,40 @@ </dependencies> </profile> + <profile> + <id>transaction-atomikos</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-narayana</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-narayana</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>transaction-seata</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-base-seata-at</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>mode-repo-memory</id> <dependencies> diff --git a/examples/pom.xml b/examples/pom.xml index 39d7fcd9012..6ee4aef3f60 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -100,6 +100,11 @@ <artifactId>shardingsphere-transaction-xa-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-transaction-xa-narayana</artifactId> diff --git a/kernel/transaction/type/base/seata-at/pom.xml b/kernel/transaction/type/base/seata-at/pom.xml index 5c2adbe938f..591b1918b90 100644 --- a/kernel/transaction/type/base/seata-at/pom.xml +++ b/kernel/transaction/type/base/seata-at/pom.xml @@ -39,6 +39,16 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> + <version>${httpcore5.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -56,22 +66,17 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.httpcomponents.core5</groupId> - <artifactId>httpcore5</artifactId> - <version>${httpcore5.version}</version> - </dependency> - <dependency> <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> </dependency> </dependencies> </project> diff --git a/kernel/transaction/type/xa/core/pom.xml b/kernel/transaction/type/xa/core/pom.xml index 1781c4f1d77..2076fafc289 100644 --- a/kernel/transaction/type/xa/core/pom.xml +++ b/kernel/transaction/type/xa/core/pom.xml @@ -35,19 +35,20 @@ <artifactId>shardingsphere-transaction-xa-spi</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <artifactId>shardingsphere-test-fixture-database</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-test-fixture-database</artifactId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-infra-database-mysql</artifactId> diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml index 7d7ee8652e3..67a88b1fbc1 100644 --- a/test/e2e/fixture/pom.xml +++ b/test/e2e/fixture/pom.xml @@ -150,6 +150,11 @@ <artifactId>shardingsphere-transaction-xa-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-transaction-xa-narayana</artifactId> diff --git a/test/e2e/operation/transaction/pom.xml b/test/e2e/operation/transaction/pom.xml index e32bcd960a0..625806c68de 100644 --- a/test/e2e/operation/transaction/pom.xml +++ b/test/e2e/operation/transaction/pom.xml @@ -41,11 +41,22 @@ <artifactId>shardingsphere-jdbc</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-transaction-xa-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-narayana</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> @@ -157,11 +168,6 @@ <artifactId>transactions-jdbc</artifactId> <version>${atomikos.version}</version> </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-transaction-xa-narayana</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.jboss.narayana.jta</groupId> <artifactId>jta</artifactId> diff --git a/test/native/pom.xml b/test/native/pom.xml index 4da7894c36b..a1a7ff908b6 100644 --- a/test/native/pom.xml +++ b/test/native/pom.xml @@ -76,6 +76,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-transaction-xa-atomikos</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-transaction-xa-narayana</artifactId>