Skip to content

Commit 15572a0

Browse files
slievrlyslievrly
authored
release: release for 1.6.1
2 parents d0f63fd + cd339cd commit 15572a0

File tree

55 files changed

+1080
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1080
-383
lines changed

‎.github/workflows/test.yml‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [ test*, "*.*.*" ]
66

77
jobs:
8+
# job 1
89
test:
910
name: "test"
1011
runs-on: ubuntu-latest
@@ -13,8 +14,8 @@ jobs:
1314
matrix:
1415
java: [ 8, 11, 17 ]
1516
springboot: [
16-
2.7.2 -Dspring-framework.version=5.3.22,
17-
2.6.10 -Dspring-framework.version=5.3.22,
17+
2.7.6 -Dspring-framework.version=5.3.24,
18+
2.6.14 -Dspring-framework.version=5.3.24,
1819
2.5.14 -Dspring-framework.version=5.3.20,
1920
2.4.13 -Dspring-framework.version=5.3.13,
2021
2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
@@ -32,14 +33,12 @@ jobs:
3233
# step 1
3334
- name: "Checkout"
3435
uses: actions/[email protected]
35-
3636
# step 2
3737
- name: "Set up Java JDK"
3838
uses: actions/[email protected]
3939
with:
4040
distribution: 'zulu'
4141
java-version: ${{ matrix.java }}
42-
4342
# step 3
4443
- name: "Test with Maven"
4544
# https://docs.github.com/cn/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
@@ -49,14 +48,42 @@ jobs:
4948
else
5049
./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true -Dlicense.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
5150
fi
52-
arm64-test:
51+
52+
# job 2
53+
test-springboot3x:
54+
name: "test-springboot3.x"
55+
runs-on: ubuntu-latest
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
java: [ 17 ]
60+
springboot: [
61+
3.0.0 -Dspring-framework.version=6.0.2 -Dspring-boot-for-server.version=2.4.13 -Dspring-framework-for-server.version=5.3.18 -Dkotlin-maven-plugin.version=1.7.22
62+
]
63+
steps:
64+
# step 1
65+
- name: "Checkout"
66+
uses: actions/[email protected]
67+
# step 2
68+
- name: "Set up Java JDK"
69+
uses: actions/[email protected]
70+
with:
71+
distribution: 'zulu'
72+
java-version: ${{ matrix.java }}
73+
# step 3
74+
- name: "Test with Maven"
75+
run: |
76+
./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
77+
78+
# job 3
79+
arm64-test:
5380
runs-on: ubuntu-latest
5481
strategy:
5582
fail-fast: false
5683
matrix:
5784
springboot: [
58-
2.7.2 -Dspring-framework.version=5.3.22,
59-
2.6.10 -Dspring-framework.version=5.3.22,
85+
2.7.6 -Dspring-framework.version=5.3.24,
86+
2.6.14 -Dspring-framework.version=5.3.24,
6087
2.5.14 -Dspring-framework.version=5.3.20,
6188
2.4.13 -Dspring-framework.version=5.3.13,
6289
2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
@@ -69,7 +96,7 @@ jobs:
6996
#1.2.8.RELEASE,
7097
#1.1.12.RELEASE,
7198
#1.0.2.RELEASE
72-
]
99+
]
73100
steps:
74101
- uses: actions/checkout@v2
75102
- name: Set up QEMU

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ For more details about principle and design, please go to [Seata wiki page](http
8282

8383
## Maven dependency
8484
```xml
85-
<seata.version>1.6.0</seata.version>
85+
<seata.version>1.6.1</seata.version>
8686
<dependency>
8787
<groupId>io.seata</groupId>
8888
<artifactId>seata-all</artifactId>

‎all/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@
148148
<artifactId>seata-http</artifactId>
149149
<version>${project.version}</version>
150150
</dependency>
151+
<dependency>
152+
<groupId>io.seata</groupId>
153+
<artifactId>seata-http-jakarta</artifactId>
154+
<version>${project.version}</version>
155+
</dependency>
151156
<dependency>
152157
<groupId>io.seata</groupId>
153158
<artifactId>seata-dubbo-alibaba</artifactId>

‎build/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<properties>
6565
<!-- seata version -->
66-
<revision>1.6.0</revision>
66+
<revision>1.6.1</revision>
6767

6868
<!-- Compiler settings properties -->
6969
<java.version>1.8</java.version>
@@ -76,6 +76,10 @@
7676
<spring-boot.version>2.5.13</spring-boot.version>
7777
<spring-framework.version>5.3.19</spring-framework.version>
7878

79+
<!-- For test -->
80+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
81+
<junit-platform.version>1.8.2</junit-platform.version>
82+
7983
<!-- Maven plugin versions -->
8084
<!-- Build -->
8185
<easyj-maven-plugin.version>1.0.5</easyj-maven-plugin.version>

‎changes/en-us/1.6.1.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
### 1.6.1
2+
3+
[source](https://github.com/seata/seata/archive/v1.6.1.zip) |
4+
[binary](https://github.com/seata/seata/releases/download/v1.6.1/seata-server-1.6.1.zip)
5+
6+
<details>
7+
<summary><mark>Release notes</mark></summary>
8+
9+
10+
### Seata 1.6.1
11+
12+
Seata 1.6.1 Released.
13+
14+
Seata is an easy-to-use, high-performance, open source distributed transaction solution.
15+
16+
The version is updated as follows:
17+
18+
### feature:
19+
- [[#5115](https://github.com/seata/seata/pull/5115)] support for `spring-boot:3.x`
20+
21+
### bugfix:
22+
- [[#5179](https://github.com/seata/seata/pull/5179)] fix ClassNotFoundException when server starts using Eureka
23+
24+
### optimize:
25+
- [[#5120](https://github.com/seata/seata/pull/5120)] unify the format of configuration items in yml files
26+
- [[#5180](https://github.com/seata/seata/pull/5180)] GlobalTransactionScanner,SeataAutoDataSourceProxyCreator declare @bean methods as static
27+
- [[#5182](https://github.com/seata/seata/pull/5182)] fix some security vulnerabilities in GGEditor
28+
- [[#5183](https://github.com/seata/seata/pull/5183)] optimize the default values for some switches
29+
30+
Thanks to these contributors for their code commits. Please report an unintended omission.
31+
32+
<!-- Please make sure your Github ID is in the list below -->
33+
- [slievrly](https://github.com/slievrly)
34+
- [wangliang181230](https://github.com/wangliang181230)
35+
- [xingfudeshi](https://github.com/xingfudeshi)
36+
- [whxxxxx](https://github.com/whxxxxx)
37+
- [xssdpgy](https://github.com/xssdpgy)
38+
39+
Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
40+
41+
#### Link
42+
43+
- **Seata:** https://github.com/seata/seata
44+
- **Seata-Samples:** https://github.com/seata/seata-samples
45+
- **Release:** https://github.com/seata/seata/releases
46+
- **WebSite:** https://seata.io
47+
48+
49+
</details>

‎changes/zh-cn/1.6.1.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
### 1.6.1
2+
3+
[source](https://github.com/seata/seata/archive/v1.6.1.zip) |
4+
[binary](https://github.com/seata/seata/releases/download/v1.6.1/seata-server-1.6.1.zip)
5+
6+
<details>
7+
<summary><mark>Release notes</mark></summary>
8+
9+
10+
### Seata 1.6.1
11+
12+
Seata 1.6.1 发布。
13+
14+
Seata 是一款开源的分布式事务解决方案，提供高性能和简单易用的分布式事务服务。
15+
16+
此版本更新如下：
17+
18+
### feature:
19+
- [[#5115](https://github.com/seata/seata/pull/5115)] 支持 `spring-boot:3.x`
20+
21+
### bugfix:
22+
- [[#5179](https://github.com/seata/seata/pull/5179)] 修复使用Eureka作为注册中心ClassNotFoundException问题
23+
24+
### optimize：
25+
- [[#5120](https://github.com/seata/seata/pull/5120)] 统一yml文件中的配置项格式
26+
- [[#5180](https://github.com/seata/seata/pull/5180)] GlobalTransactionScanner,SeataAutoDataSourceProxyCreator 创建bean用static修饰
27+
- [[#5182](https://github.com/seata/seata/pull/5182)] 修复 Saga 可视化设计器 GGEditor 安全漏洞
28+
- [[#5183](https://github.com/seata/seata/pull/5183)] 优化配置开关的默认值
29+
30+
非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
31+
32+
<!-- 请确保您的 GitHub ID 在以下列表中 -->
33+
- [slievrly](https://github.com/slievrly)
34+
- [wangliang181230](https://github.com/wangliang181230)
35+
- [xingfudeshi](https://github.com/xingfudeshi)
36+
- [whxxxxx](https://github.com/whxxxxx)
37+
- [xssdpgy](https://github.com/xssdpgy)
38+
39+
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
40+
41+
42+
#### Link
43+
44+
- **Seata:** https://github.com/seata/seata
45+
- **Seata-Samples:** https://github.com/seata/seata-samples
46+
- **Release:** https://github.com/seata/seata/releases
47+
- **WebSite:** https://seata.io
48+
49+
</details>

‎common/src/main/java/io/seata/common/DefaultValues.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public interface DefaultValues {
168168
/**
169169
* the constant DEFAULT_RPC_RM_REQUEST_TIMEOUT
170170
*/
171-
long DEFAULT_RPC_RM_REQUEST_TIMEOUT = Duration.ofSeconds(30).toMillis();
171+
long DEFAULT_RPC_RM_REQUEST_TIMEOUT = Duration.ofSeconds(15).toMillis();
172172

173173
/**
174174
* the constant DEFAULT_RPC_TM_REQUEST_TIMEOUT
@@ -178,7 +178,7 @@ public interface DefaultValues {
178178
/**
179179
* the constant DEFAULT_RPC_TC_REQUEST_TIMEOUT
180180
*/
181-
long DEFAULT_RPC_TC_REQUEST_TIMEOUT = Duration.ofSeconds(30).toMillis();
181+
long DEFAULT_RPC_TC_REQUEST_TIMEOUT = Duration.ofSeconds(15).toMillis();
182182

183183
/**
184184
* the constant DEFAULT_XAER_NOTA_RETRY_TIMEOUT
@@ -269,4 +269,16 @@ public interface DefaultValues {
269269
* DEFAULT_ENABLE_BRANCH_ASYNC_REMOVE
270270
*/
271271
boolean DEFAULT_ENABLE_BRANCH_ASYNC_REMOVE = false;
272+
273+
int DEFAULT_DB_MAX_CONN = 100;
274+
275+
int DEFAULT_DB_MIN_CONN = 10;
276+
277+
int DEFAULT_REDIS_MAX_IDLE = 100;
278+
279+
int DEFAULT_REDIS_MAX_TOTAL = 100;
280+
281+
int DEFAULT_REDIS_MIN_IDLE = 10;
282+
283+
int DEFAULT_QUERY_LIMIT = 1000;
272284
}

‎console/pom.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,39 @@
2828
<name>seata-console ${project.version}</name>
2929
<description>console for Seata built with Maven</description>
3030

31+
<properties>
32+
<spring-boot-for-server.version>${spring-boot.version}</spring-boot-for-server.version>
33+
<spring-framework-for-server.version>${spring-framework.version}</spring-framework-for-server.version>
34+
</properties>
35+
36+
<dependencyManagement>
37+
<dependencies>
38+
<!-- spring-framework-->
39+
<dependency>
40+
<groupId>org.springframework</groupId>
41+
<artifactId>spring-framework-bom</artifactId>
42+
<version>${spring-framework-for-server.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
47+
<!-- spring-boot -->
48+
<dependency>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-dependencies</artifactId>
51+
<version>${spring-boot-for-server.version}</version>
52+
<exclusions>
53+
<exclusion>
54+
<groupId>org.springframework</groupId>
55+
<artifactId>spring-framework-bom</artifactId>
56+
</exclusion>
57+
</exclusions>
58+
<type>pom</type>
59+
<scope>import</scope>
60+
</dependency>
61+
</dependencies>
62+
</dependencyManagement>
63+
3164
<dependencies>
3265
<dependency>
3366
<groupId>org.springframework.boot</groupId>

‎core/src/main/java/io/seata/core/protocol/Version.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class Version {
3636
/**
3737
* The constant CURRENT.
3838
*/
39-
private static final String CURRENT = "1.6.0";
39+
private static final String CURRENT = "1.6.1";
4040
private static final String VERSION_0_7_1 = "0.7.1";
4141
private static final String VERSION_1_5_0 = "1.5.0";
4242
private static final int MAX_VERSION_DOT = 3;

‎core/src/main/java/io/seata/core/rpc/processor/server/ServerOnRequestProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class ServerOnRequestProcessor implements RemotingProcessor, Disposable {
102102
private static final long KEEP_ALIVE_TIME = Integer.MAX_VALUE;
103103
private static final String BATCH_RESPONSE_THREAD_PREFIX = "rpcBatchResponse";
104104
private static final boolean PARALLEL_REQUEST_HANDLE =
105-
ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_PARALLEL_REQUEST_HANDLE_KEY, false);
105+
ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_PARALLEL_REQUEST_HANDLE_KEY, true);
106106

107107
public ServerOnRequestProcessor(RemotingServer remotingServer, TransactionMessageHandler transactionMessageHandler) {
108108
this.remotingServer = remotingServer;

0 commit comments

Comments
 (0)