This is an automated email from the ASF dual-hosted git repository. jianbin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-seata-samples.git
The following commit(s) were added to refs/heads/master by this push: new 7adfb58e feature: upgrade samples seata dependency to 2.1.0 (#688) 7adfb58e is described below commit 7adfb58e915f9bd1be2103d73a307bf1e6ef1ac7 Author: A Cabbage <928124...@qq.com> AuthorDate: Mon Sep 16 16:33:21 2024 +0800 feature: upgrade samples seata dependency to 2.1.0 (#688) --- at-sample/at-api/pom.xml | 6 +++--- at-sample/at-api/seata-e2e.yaml | 2 +- at-sample/dubbo-samples-seata/README.md | 2 +- .../dubbo-samples-seata/dubbo-samples-seata-account/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../dubbo-samples-seata/dubbo-samples-seata-business/pom.xml | 2 +- .../dubbo-samples-seata/dubbo-samples-seata-order/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../dubbo-samples-seata/dubbo-samples-seata-stock/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- at-sample/dubbo-samples-seata/pom.xml | 4 ++-- at-sample/spring-dubbo-seata/pom.xml | 6 +++--- at-sample/spring-seata/pom.xml | 6 +++--- at-sample/springboot-dubbo-seata/pom.xml | 2 +- at-sample/springboot-dubbo-seata/seata-e2e.yaml | 2 +- .../springboot-dubbo-seata-account/pom.xml | 10 +++++----- .../springboot-dubbo-seata-business/pom.xml | 10 +++++----- .../springboot-dubbo-seata-common/pom.xml | 4 ++-- .../springboot-dubbo-seata-order/pom.xml | 10 +++++----- .../springboot-dubbo-seata-storage/pom.xml | 10 +++++----- at-sample/springboot-mybatis-seata/pom.xml | 6 +++--- at-sample/springboot-seata/pom.xml | 6 +++--- e2e-test/e2e-test-builder/pom.xml | 4 ++-- e2e-test/e2e-test-runner/pom.xml | 6 +++--- e2e-test/pom.xml | 2 +- pom.xml | 2 +- result.yaml | 1 - saga-sample/spring-dubbo-seata-saga/pom.xml | 6 +++--- saga-sample/spring-seata-saga/pom.xml | 6 +++--- tcc-sample/spring-dubbo-seata-tcc/pom.xml | 6 +++--- tcc-sample/springboot-sofarpc-seata-tcc/pom.xml | 6 +++--- xa-sample/springboot-feign-seata-xa/pom.xml | 2 +- .../springboot-feign-seata-account/pom.xml | 9 ++++----- .../springboot-feign-seata-business/pom.xml | 8 ++++---- .../apache/seata/SpringbootFeignSeataBusinessApplication.java | 3 +++ .../springboot-feign-seata-order/pom.xml | 8 ++++---- .../springboot-feign-seata-storage/pom.xml | 8 ++++---- 37 files changed, 89 insertions(+), 88 deletions(-) diff --git a/at-sample/at-api/pom.xml b/at-sample/at-api/pom.xml index 3d1d1350..dbf5b3a6 100644 --- a/at-sample/at-api/pom.xml +++ b/at-sample/at-api/pom.xml @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.seata</groupId> <artifactId>at-api</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -59,9 +59,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/at-sample/at-api/seata-e2e.yaml b/at-sample/at-api/seata-e2e.yaml index caa1d493..3e7f833d 100644 --- a/at-sample/at-api/seata-e2e.yaml +++ b/at-sample/at-api/seata-e2e.yaml @@ -41,7 +41,7 @@ e2e: - name: seata-server docker_service: hostname: seata - image: seataio/seata-server:2.0.0 + image: apache/seata-server:2.1.0 environment: SEATA_PORT: 8091 STORE_MODE: file diff --git a/at-sample/dubbo-samples-seata/README.md b/at-sample/dubbo-samples-seata/README.md index 2a444f7e..826546e1 100644 --- a/at-sample/dubbo-samples-seata/README.md +++ b/at-sample/dubbo-samples-seata/README.md @@ -89,7 +89,7 @@ password: 123456 ``` ### 步骤 3:启动Seata-Server -- 本文使用的是Seata-Server V2.0.0版本。 +- 本文使用的是Seata-Server V2.1.0版本。 请将下载的Seata-Server二进制包解压,并进入bin目录,然后执行以下命令即可启动Seata-Server。 diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/pom.xml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/pom.xml index ddc278e2..a0d9e069 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/pom.xml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/pom.xml @@ -54,7 +54,7 @@ <artifactId>spring-boot-starter-jdbc</artifactId> </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> </dependency> <dependency> diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/src/main/resources/application.yml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/src/main/resources/application.yml index 19b54ed1..a3410ac9 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/src/main/resources/application.yml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-account/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${mysql.address:127.0.0.1}:${mysql.port:3306}/seata?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useOldAliasMetadataBehavior=true username: root - password: helloworld + password: 123456 hikari: connection-timeout: 30000 idle-timeout: 600000 diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-business/pom.xml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-business/pom.xml index c0c9e9a4..61ba7cf6 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-business/pom.xml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-business/pom.xml @@ -46,7 +46,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> </dependency> </dependencies> diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/pom.xml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/pom.xml index 3d929a9b..8b5f7c20 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/pom.xml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/pom.xml @@ -54,7 +54,7 @@ <artifactId>spring-boot-starter-jdbc</artifactId> </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> </dependency> </dependencies> diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/src/main/resources/application.yml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/src/main/resources/application.yml index 519afebf..0b138914 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/src/main/resources/application.yml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-order/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${mysql.address:127.0.0.1}:${mysql.port:3306}/seata?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useOldAliasMetadataBehavior=true username: root - password: helloworld + password: 123456 hikari: connection-timeout: 30000 idle-timeout: 600000 diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/pom.xml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/pom.xml index 37fe39bc..a8a30471 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/pom.xml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/pom.xml @@ -54,7 +54,7 @@ <artifactId>spring-boot-starter-jdbc</artifactId> </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> </dependency> </dependencies> diff --git a/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/src/main/resources/application.yml b/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/src/main/resources/application.yml index 617df9e8..3a2b6bb1 100644 --- a/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/src/main/resources/application.yml +++ b/at-sample/dubbo-samples-seata/dubbo-samples-seata-stock/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${mysql.address:127.0.0.1}:${mysql.port:3306}/seata?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useOldAliasMetadataBehavior=true username: root - password: helloworld + password: 123456 hikari: connection-timeout: 30000 idle-timeout: 600000 diff --git a/at-sample/dubbo-samples-seata/pom.xml b/at-sample/dubbo-samples-seata/pom.xml index cab4df7b..35044e7e 100644 --- a/at-sample/dubbo-samples-seata/pom.xml +++ b/at-sample/dubbo-samples-seata/pom.xml @@ -83,9 +83,9 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> </dependencies> </dependencyManagement> diff --git a/at-sample/spring-dubbo-seata/pom.xml b/at-sample/spring-dubbo-seata/pom.xml index fd9be9d9..015d43b3 100644 --- a/at-sample/spring-dubbo-seata/pom.xml +++ b/at-sample/spring-dubbo-seata/pom.xml @@ -24,7 +24,7 @@ <groupId>org.apache.seata</groupId> <artifactId>spring-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -60,9 +60,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/at-sample/spring-seata/pom.xml b/at-sample/spring-seata/pom.xml index 7d3e3399..f3b741ee 100644 --- a/at-sample/spring-seata/pom.xml +++ b/at-sample/spring-seata/pom.xml @@ -24,7 +24,7 @@ <groupId>org.apache.seata</groupId> <artifactId>spring-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -60,9 +60,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/at-sample/springboot-dubbo-seata/pom.xml b/at-sample/springboot-dubbo-seata/pom.xml index a5987d33..4ebc4b1f 100644 --- a/at-sample/springboot-dubbo-seata/pom.xml +++ b/at-sample/springboot-dubbo-seata/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata</name> <description>springboot-dubbo-seata</description> <packaging>pom</packaging> diff --git a/at-sample/springboot-dubbo-seata/seata-e2e.yaml b/at-sample/springboot-dubbo-seata/seata-e2e.yaml index b08647f9..bf3f2510 100644 --- a/at-sample/springboot-dubbo-seata/seata-e2e.yaml +++ b/at-sample/springboot-dubbo-seata/seata-e2e.yaml @@ -94,7 +94,7 @@ e2e: - name: seata-server docker_service: hostname: seata - image: seataio/seata-server:2.0.0 + image: apache/seata-server:2.1.0 # ports: # - "7091:7091" # - "8091:8091" diff --git a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-account/pom.xml b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-account/pom.xml index 74bd3a9b..c165dee2 100644 --- a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-account/pom.xml +++ b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-account/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-dubbo-seata-account</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata-account</name> <description>springboot-dubbo-seata-account</description> @@ -66,9 +66,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> @@ -107,7 +107,7 @@ <dependency> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata-common</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> </dependencies> diff --git a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-business/pom.xml b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-business/pom.xml index 421a26cb..1438a512 100644 --- a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-business/pom.xml +++ b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-business/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-dubbo-seata-business</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata-business</name> <description>springboot-dubbo-seata-business</description> @@ -66,9 +66,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> @@ -95,7 +95,7 @@ <dependency> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata-common</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-common/pom.xml b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-common/pom.xml index 29392592..d2818e52 100644 --- a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-common/pom.xml +++ b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-common/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-dubbo-seata-common</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata-common</name> <description>springboot-dubbo-seata-common</description> <packaging>jar</packaging> diff --git a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-order/pom.xml b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-order/pom.xml index 33a8c69d..5e451ec0 100644 --- a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-order/pom.xml +++ b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-order/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-dubbo-seata-order</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata-order</name> <description>springboot-dubbo-seata-order</description> @@ -66,9 +66,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> @@ -107,7 +107,7 @@ <dependency> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata-common</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> </dependencies> diff --git a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-storage/pom.xml b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-storage/pom.xml index 3373295d..760707a8 100644 --- a/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-storage/pom.xml +++ b/at-sample/springboot-dubbo-seata/springboot-dubbo-seata-storage/pom.xml @@ -5,10 +5,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-dubbo-seata-storage</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-dubbo-seata-storage</name> <description>springboot-dubbo-seata-storage</description> @@ -48,9 +48,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> @@ -89,7 +89,7 @@ <dependency> <groupId>org.apache.seata</groupId> <artifactId>springboot-dubbo-seata-common</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> </dependencies> diff --git a/at-sample/springboot-mybatis-seata/pom.xml b/at-sample/springboot-mybatis-seata/pom.xml index 9fbdceb3..2e5b8cbd 100644 --- a/at-sample/springboot-mybatis-seata/pom.xml +++ b/at-sample/springboot-mybatis-seata/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-mybatis-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-mybatis-seata</name> <description>springboot-mybatis-seata</description> <properties> @@ -47,9 +47,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/at-sample/springboot-seata/pom.xml b/at-sample/springboot-seata/pom.xml index 0035ba3b..c39363b9 100644 --- a/at-sample/springboot-seata/pom.xml +++ b/at-sample/springboot-seata/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-seata</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-seata</name> <description>springboot-seata</description> <properties> @@ -47,9 +47,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/e2e-test/e2e-test-builder/pom.xml b/e2e-test/e2e-test-builder/pom.xml index 8f8ce263..e78acbe1 100644 --- a/e2e-test/e2e-test-builder/pom.xml +++ b/e2e-test/e2e-test-builder/pom.xml @@ -4,11 +4,11 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>e2e-test</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <groupId>org.apache.seata</groupId> <artifactId>e2e-test-builder</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>e2e-test-builder</name> <dependencies> diff --git a/e2e-test/e2e-test-runner/pom.xml b/e2e-test/e2e-test-runner/pom.xml index 7c8ba2fe..cc7096f7 100644 --- a/e2e-test/e2e-test-runner/pom.xml +++ b/e2e-test/e2e-test-runner/pom.xml @@ -4,18 +4,18 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>e2e-test</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <groupId>org.apache.seata</groupId> <artifactId>e2e-test-runner</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>e2e-test-runner</name> <dependencies> <dependency> <groupId>org.apache.seata</groupId> <artifactId>e2e-test-builder</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> </dependencies> diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml index d0e9cf76..14894d94 100644 --- a/e2e-test/pom.xml +++ b/e2e-test/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.seata</groupId> <artifactId>e2e-test</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <packaging>pom</packaging> <name>e2e-test</name> <modules> diff --git a/pom.xml b/pom.xml index 7b256592..27ae13a5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <groupId>org.apache.seata</groupId> <artifactId>seata-samples</artifactId> <packaging>pom</packaging> - <version>2.0.0</version> + <version>2.1.0</version> <name>seata-samples ${project.version}</name> </project> diff --git a/result.yaml b/result.yaml deleted file mode 100644 index 635f7b83..00000000 --- a/result.yaml +++ /dev/null @@ -1 +0,0 @@ -{"res": "rollback"} \ No newline at end of file diff --git a/saga-sample/spring-dubbo-seata-saga/pom.xml b/saga-sample/spring-dubbo-seata-saga/pom.xml index 21bfa56b..563ac45c 100644 --- a/saga-sample/spring-dubbo-seata-saga/pom.xml +++ b/saga-sample/spring-dubbo-seata-saga/pom.xml @@ -24,7 +24,7 @@ <groupId>org.apache.seata</groupId> <artifactId>spring-seata-dubbo-saga</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -60,9 +60,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/saga-sample/spring-seata-saga/pom.xml b/saga-sample/spring-seata-saga/pom.xml index 045f49d7..5ad6d5a6 100644 --- a/saga-sample/spring-seata-saga/pom.xml +++ b/saga-sample/spring-seata-saga/pom.xml @@ -24,7 +24,7 @@ <groupId>org.apache.seata</groupId> <artifactId>spring-seata-saga</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -60,9 +60,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/tcc-sample/spring-dubbo-seata-tcc/pom.xml b/tcc-sample/spring-dubbo-seata-tcc/pom.xml index 683b602b..9e002086 100644 --- a/tcc-sample/spring-dubbo-seata-tcc/pom.xml +++ b/tcc-sample/spring-dubbo-seata-tcc/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.seata</groupId> <artifactId>spring-dubbo-seata-tcc</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <packaging>jar</packaging> <name>spring-dubbo-seata-tcc</name> @@ -63,9 +63,9 @@ <!-- log dependency end --> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-all</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/tcc-sample/springboot-sofarpc-seata-tcc/pom.xml b/tcc-sample/springboot-sofarpc-seata-tcc/pom.xml index 87eeab6f..b09f1f4e 100644 --- a/tcc-sample/springboot-sofarpc-seata-tcc/pom.xml +++ b/tcc-sample/springboot-sofarpc-seata-tcc/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.seata</groupId> <artifactId>springboot-sofarpc-seata-tcc</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <packaging>jar</packaging> <name>spring-sofarpc-seata-tcc</name> @@ -54,9 +54,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/xa-sample/springboot-feign-seata-xa/pom.xml b/xa-sample/springboot-feign-seata-xa/pom.xml index ed462751..04648aee 100644 --- a/xa-sample/springboot-feign-seata-xa/pom.xml +++ b/xa-sample/springboot-feign-seata-xa/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-feign-seata-xa</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-feign-seata-xa</name> <description>springboot-feign-seata-xa</description> <packaging>pom</packaging> diff --git a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-account/pom.xml b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-account/pom.xml index a0b5b3dc..8f552232 100644 --- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-account/pom.xml +++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-account/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-feign-seata-xa</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-feign-seata-account</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-feign-seata-account</name> <description>springboot-feign-seata-account</description> @@ -80,11 +80,10 @@ <artifactId>mysql-connector-java</artifactId> <version>8.0.28</version> </dependency> - <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml index 8d130019..99bcfcaf 100644 --- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml +++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-feign-seata-xa</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-feign-seata-business</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-feign-seata-business</name> <description>springboot-feign-seata-business</description> @@ -82,9 +82,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/src/main/java/org/apache/seata/SpringbootFeignSeataBusinessApplication.java b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/src/main/java/org/apache/seata/SpringbootFeignSeataBusinessApplication.java index 8ab944f6..04c399ad 100644 --- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/src/main/java/org/apache/seata/SpringbootFeignSeataBusinessApplication.java +++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/src/main/java/org/apache/seata/SpringbootFeignSeataBusinessApplication.java @@ -16,12 +16,15 @@ */ package org.apache.seata; +import io.seata.spring.annotation.datasource.EnableAutoDataSourceProxy; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableFeignClients +@EnableAutoDataSourceProxy(dataSourceProxyMode = "XA") public class SpringbootFeignSeataBusinessApplication { public static void main(String[] args) { diff --git a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml index 997aad90..5e821fcf 100644 --- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml +++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-feign-seata-xa</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-feign-seata-order</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-feign-seata-order</name> <description>springboot-feign-seata-order</description> @@ -82,9 +82,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> diff --git a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-storage/pom.xml b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-storage/pom.xml index 0c755a75..b510db68 100644 --- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-storage/pom.xml +++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-storage/pom.xml @@ -5,10 +5,10 @@ <parent> <groupId>org.apache.seata</groupId> <artifactId>springboot-feign-seata-xa</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <artifactId>springboot-feign-seata-storage</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>springboot-feign-seata-storage</name> <description>springboot-feign-seata-storage</description> @@ -64,9 +64,9 @@ </dependency> <dependency> - <groupId>io.seata</groupId> + <groupId>org.apache.seata</groupId> <artifactId>seata-spring-boot-starter</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org For additional commands, e-mail: notifications-h...@seata.apache.org