Skip to content

Commit 4b419a4

Browse files
funky-eyesfunky-eyes
authored
optimize: change version to 2.2.0-SNAPSHOT (#6808)
1 parent cec5edf commit 4b419a4

File tree

9 files changed

+93
-97
lines changed

9 files changed

+93
-97
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,14 @@ jobs:
2727

2828
# step 2: Initializes the CodeQL tools for scanning.
2929
- name: "Initialize CodeQL"
30-
uses: github/codeql-action/init@v2
30+
uses: github/codeql-action/init@v3
3131
with:
3232
languages: ${{ matrix.language }}
3333

34-
# step 3
35-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
36-
# If this step fails, then you should remove it and run the build manually (see below)
37-
- name: "Autobuild"
38-
uses: github/codeql-action/autobuild@v2
34+
- run: ./mvnw -T 4C clean install -DskipTests
3935

40-
# step 4
36+
# step 3
4137
- name: "Perform CodeQL Analysis"
42-
uses: github/codeql-action/analyze@v2
38+
uses: github/codeql-action/analyze@v3
4339
with:
4440
category: "/language:${{matrix.language}}"

‎build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
<properties>
7373
<!-- seata version -->
74-
<revision>2.1.0-SNAPSHOT</revision>
74+
<revision>2.2.0-SNAPSHOT</revision>
7575

7676
<!-- Compiler settings properties -->
7777
<java.version>1.8</java.version>

‎changes/en-us/1.7.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The version is updated as follows:
8282
- [[#5648](https://github.com/seata/seata/pull/5648)] optimize server logs print
8383
- [[#5647](https://github.com/seata/seata/pull/5647)] support case-sensitive attributes for table and column metadata
8484
- [[#5678](https://github.com/seata/seata/pull/5678)] optimize escape character for case of columnNames
85-
- [[#5684](https://github.com/seata/seata/pull/5684)] optimize github actions for CodeQL, skywalking-eyes and checkout
85+
- [[#5685](https://github.com/seata/seata/pull/5685)] optimize github actions for CodeQL, skywalking-eyes and checkout
8686
- [[#5700](https://github.com/seata/seata/pull/5700)] optimize distributed lock log
8787

8888

‎changes/en-us/2.x.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Add changes here for all PR submitted to the 2.x branch.
7878
- [[#6793](https://github.com/apache/incubator-seata/pull/6795)] optimize the initialization logic for server meta
7979
- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize NacosMockTest UT case
8080
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize `tableMeta` cache scheduled refresh issue
81+
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
8182

8283

8384
### refactor:

‎changes/zh-cn/2.x.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] 优化 NacosMockTest 单测问题
8080
- [[#6793](https://github.com/apache/incubator-seata/pull/6795)] 独立server的meta信息初始化逻辑
8181
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)] 优化`tableMeta`缓存定时刷新问题
82-
82+
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
8383

8484
### refactor:
8585

‎distribution/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ Apache-2.0 licenses
398398
io.prometheus:simpleclient_tracer_common 0.15.0 Apache-2.0
399399
io.prometheus:simpleclient_tracer_otel 0.15.0 Apache-2.0
400400
io.prometheus:simpleclient_tracer_otel_agent 0.15.0 Apache-2.0
401-
io.seata:seata-all 2.1.0-SNAPSHOT Apache-2.0
401+
io.seata:seata-all 2.2.0-SNAPSHOT Apache-2.0
402402
javax.inject:javax.inject 1 Apache-2.0
403403
joda-time:joda-time 2.3 Apache-2.0
404404
net.bytebuddy:byte-buddy-agent 1.10.22 Apache-2.0

‎distribution/NOTICE.md

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -150,35 +150,35 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
150150
├── proto-google-common-protos-1.17.0.jar
151151
├── reflectasm-1.11.9.jar
152152
├── registry-client-all-6.3.0.jar
153-
├── seata-common-2.1.0-SNAPSHOT.jar
154-
├── seata-compressor-all-2.1.0-SNAPSHOT.jar
155-
├── seata-compressor-bzip2-2.1.0-SNAPSHOT.jar
156-
├── seata-compressor-deflater-2.1.0-SNAPSHOT.jar
157-
├── seata-compressor-gzip-2.1.0-SNAPSHOT.jar
158-
├── seata-compressor-lz4-2.1.0-SNAPSHOT.jar
159-
├── seata-compressor-zip-2.1.0-SNAPSHOT.jar
160-
├── seata-config-all-2.1.0-SNAPSHOT.jar
161-
├── seata-config-apollo-2.1.0-SNAPSHOT.jar
162-
├── seata-config-consul-2.1.0-SNAPSHOT.jar
163-
├── seata-config-core-2.1.0-SNAPSHOT.jar
164-
├── seata-config-etcd3-2.1.0-SNAPSHOT.jar
165-
├── seata-config-nacos-2.1.0-SNAPSHOT.jar
166-
├── seata-config-spring-cloud-2.1.0-SNAPSHOT.jar
167-
├── seata-config-zk-2.1.0-SNAPSHOT.jar
168-
├── seata-core-2.1.0-SNAPSHOT.jar
169-
├── seata-discovery-consul-2.1.0-SNAPSHOT.jar
170-
├── seata-discovery-custom-2.1.0-SNAPSHOT.jar
171-
├── seata-discovery-etcd3-2.1.0-SNAPSHOT.jar
172-
├── seata-discovery-nacos-2.1.0-SNAPSHOT.jar
173-
├── seata-discovery-redis-2.1.0-SNAPSHOT.jar
174-
├── seata-discovery-sofa-2.1.0-SNAPSHOT.jar
175-
├── seata-metrics-api-2.1.0-SNAPSHOT.jar
176-
├── seata-metrics-core-2.1.0-SNAPSHOT.jar
177-
├── seata-metrics-registry-compact-2.1.0-SNAPSHOT.jar
178-
├── seata-serializer-all-2.1.0-SNAPSHOT.jar
179-
├── seata-serializer-hessian-2.1.0-SNAPSHOT.jar
180-
├── seata-serializer-kryo-2.1.0-SNAPSHOT.jar
181-
├── seata-spring-autoconfigure-server-2.1.0-SNAPSHOT.jar
153+
├── seata-common-2.2.0-SNAPSHOT.jar
154+
├── seata-compressor-all-2.2.0-SNAPSHOT.jar
155+
├── seata-compressor-bzip2-2.2.0-SNAPSHOT.jar
156+
├── seata-compressor-deflater-2.2.0-SNAPSHOT.jar
157+
├── seata-compressor-gzip-2.2.0-SNAPSHOT.jar
158+
├── seata-compressor-lz4-2.2.0-SNAPSHOT.jar
159+
├── seata-compressor-zip-2.2.0-SNAPSHOT.jar
160+
├── seata-config-all-2.2.0-SNAPSHOT.jar
161+
├── seata-config-apollo-2.2.0-SNAPSHOT.jar
162+
├── seata-config-consul-2.2.0-SNAPSHOT.jar
163+
├── seata-config-core-2.2.0-SNAPSHOT.jar
164+
├── seata-config-etcd3-2.2.0-SNAPSHOT.jar
165+
├── seata-config-nacos-2.2.0-SNAPSHOT.jar
166+
├── seata-config-spring-cloud-2.2.0-SNAPSHOT.jar
167+
├── seata-config-zk-2.2.0-SNAPSHOT.jar
168+
├── seata-core-2.2.0-SNAPSHOT.jar
169+
├── seata-discovery-consul-2.2.0-SNAPSHOT.jar
170+
├── seata-discovery-custom-2.2.0-SNAPSHOT.jar
171+
├── seata-discovery-etcd3-2.2.0-SNAPSHOT.jar
172+
├── seata-discovery-nacos-2.2.0-SNAPSHOT.jar
173+
├── seata-discovery-redis-2.2.0-SNAPSHOT.jar
174+
├── seata-discovery-sofa-2.2.0-SNAPSHOT.jar
175+
├── seata-metrics-api-2.2.0-SNAPSHOT.jar
176+
├── seata-metrics-core-2.2.0-SNAPSHOT.jar
177+
├── seata-metrics-registry-compact-2.2.0-SNAPSHOT.jar
178+
├── seata-serializer-all-2.2.0-SNAPSHOT.jar
179+
├── seata-serializer-hessian-2.2.0-SNAPSHOT.jar
180+
├── seata-serializer-kryo-2.2.0-SNAPSHOT.jar
181+
├── seata-spring-autoconfigure-server-2.2.0-SNAPSHOT.jar
182182
├── servo-core-0.12.21.jar
183183
├── simpleclient-0.15.0.jar
184184
├── simpleclient_common-0.15.0.jar
@@ -252,17 +252,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
252252
├── protobuf-java-3.16.3.jar
253253
├── protobuf-java-util-3.11.0.jar
254254
├── rocksdbjni-7.7.3.jar
255-
├── seata-compressor-zstd-2.1.0-SNAPSHOT.jar
256-
├── seata-console-2.1.0-SNAPSHOT.jar
257-
├── seata-discovery-all-2.1.0-SNAPSHOT.jar
258-
├── seata-discovery-core-2.1.0-SNAPSHOT.jar
259-
├── seata-discovery-eureka-2.1.0-SNAPSHOT.jar
260-
├── seata-discovery-zk-2.1.0-SNAPSHOT.jar
261-
├── seata-metrics-all-2.1.0-SNAPSHOT.jar
262-
├── seata-metrics-exporter-prometheus-2.1.0-SNAPSHOT.jar
263-
├── seata-serializer-protobuf-2.1.0-SNAPSHOT.jar
264-
├── seata-serializer-seata-2.1.0-SNAPSHOT.jar
265-
├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar
255+
├── seata-compressor-zstd-2.2.0-SNAPSHOT.jar
256+
├── seata-console-2.2.0-SNAPSHOT.jar
257+
├── seata-discovery-all-2.2.0-SNAPSHOT.jar
258+
├── seata-discovery-core-2.2.0-SNAPSHOT.jar
259+
├── seata-discovery-eureka-2.2.0-SNAPSHOT.jar
260+
├── seata-discovery-zk-2.2.0-SNAPSHOT.jar
261+
├── seata-metrics-all-2.2.0-SNAPSHOT.jar
262+
├── seata-metrics-exporter-prometheus-2.2.0-SNAPSHOT.jar
263+
├── seata-serializer-protobuf-2.2.0-SNAPSHOT.jar
264+
├── seata-serializer-seata-2.2.0-SNAPSHOT.jar
265+
├── seata-spring-autoconfigure-core-2.2.0-SNAPSHOT.jar
266266
├── simpleclient_httpserver-0.15.0.jar
267267
├── slf4j-api-1.7.36.jar
268268
├── spring-boot-2.7.17.jar
@@ -432,35 +432,35 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
432432
├── proto-google-common-protos-1.17.0.jar
433433
├── reflectasm-1.11.9.jar
434434
├── registry-client-all-6.3.0.jar
435-
├── seata-common-2.1.0-SNAPSHOT.jar
436-
├── seata-compressor-all-2.1.0-SNAPSHOT.jar
437-
├── seata-compressor-bzip2-2.1.0-SNAPSHOT.jar
438-
├── seata-compressor-deflater-2.1.0-SNAPSHOT.jar
439-
├── seata-compressor-gzip-2.1.0-SNAPSHOT.jar
440-
├── seata-compressor-lz4-2.1.0-SNAPSHOT.jar
441-
├── seata-compressor-zip-2.1.0-SNAPSHOT.jar
442-
├── seata-config-all-2.1.0-SNAPSHOT.jar
443-
├── seata-config-apollo-2.1.0-SNAPSHOT.jar
444-
├── seata-config-consul-2.1.0-SNAPSHOT.jar
445-
├── seata-config-core-2.1.0-SNAPSHOT.jar
446-
├── seata-config-etcd3-2.1.0-SNAPSHOT.jar
447-
├── seata-config-nacos-2.1.0-SNAPSHOT.jar
448-
├── seata-config-spring-cloud-2.1.0-SNAPSHOT.jar
449-
├── seata-config-zk-2.1.0-SNAPSHOT.jar
450-
├── seata-core-2.1.0-SNAPSHOT.jar
451-
├── seata-discovery-consul-2.1.0-SNAPSHOT.jar
452-
├── seata-discovery-custom-2.1.0-SNAPSHOT.jar
453-
├── seata-discovery-etcd3-2.1.0-SNAPSHOT.jar
454-
├── seata-discovery-nacos-2.1.0-SNAPSHOT.jar
455-
├── seata-discovery-redis-2.1.0-SNAPSHOT.jar
456-
├── seata-discovery-sofa-2.1.0-SNAPSHOT.jar
457-
├── seata-metrics-api-2.1.0-SNAPSHOT.jar
458-
├── seata-metrics-core-2.1.0-SNAPSHOT.jar
459-
├── seata-metrics-registry-compact-2.1.0-SNAPSHOT.jar
460-
├── seata-serializer-all-2.1.0-SNAPSHOT.jar
461-
├── seata-serializer-hessian-2.1.0-SNAPSHOT.jar
462-
├── seata-serializer-kryo-2.1.0-SNAPSHOT.jar
463-
├── seata-spring-autoconfigure-server-2.1.0-SNAPSHOT.jar
435+
├── seata-common-2.2.0-SNAPSHOT.jar
436+
├── seata-compressor-all-2.2.0-SNAPSHOT.jar
437+
├── seata-compressor-bzip2-2.2.0-SNAPSHOT.jar
438+
├── seata-compressor-deflater-2.2.0-SNAPSHOT.jar
439+
├── seata-compressor-gzip-2.2.0-SNAPSHOT.jar
440+
├── seata-compressor-lz4-2.2.0-SNAPSHOT.jar
441+
├── seata-compressor-zip-2.2.0-SNAPSHOT.jar
442+
├── seata-config-all-2.2.0-SNAPSHOT.jar
443+
├── seata-config-apollo-2.2.0-SNAPSHOT.jar
444+
├── seata-config-consul-2.2.0-SNAPSHOT.jar
445+
├── seata-config-core-2.2.0-SNAPSHOT.jar
446+
├── seata-config-etcd3-2.2.0-SNAPSHOT.jar
447+
├── seata-config-nacos-2.2.0-SNAPSHOT.jar
448+
├── seata-config-spring-cloud-2.2.0-SNAPSHOT.jar
449+
├── seata-config-zk-2.2.0-SNAPSHOT.jar
450+
├── seata-core-2.2.0-SNAPSHOT.jar
451+
├── seata-discovery-consul-2.2.0-SNAPSHOT.jar
452+
├── seata-discovery-custom-2.2.0-SNAPSHOT.jar
453+
├── seata-discovery-etcd3-2.2.0-SNAPSHOT.jar
454+
├── seata-discovery-nacos-2.2.0-SNAPSHOT.jar
455+
├── seata-discovery-redis-2.2.0-SNAPSHOT.jar
456+
├── seata-discovery-sofa-2.2.0-SNAPSHOT.jar
457+
├── seata-metrics-api-2.2.0-SNAPSHOT.jar
458+
├── seata-metrics-core-2.2.0-SNAPSHOT.jar
459+
├── seata-metrics-registry-compact-2.2.0-SNAPSHOT.jar
460+
├── seata-serializer-all-2.2.0-SNAPSHOT.jar
461+
├── seata-serializer-hessian-2.2.0-SNAPSHOT.jar
462+
├── seata-serializer-kryo-2.2.0-SNAPSHOT.jar
463+
├── seata-spring-autoconfigure-server-2.2.0-SNAPSHOT.jar
464464
├── servo-core-0.12.21.jar
465465
├── simpleclient-0.15.0.jar
466466
├── simpleclient_common-0.15.0.jar
@@ -534,17 +534,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
534534
├── protobuf-java-3.16.3.jar
535535
├── protobuf-java-util-3.11.0.jar
536536
├── rocksdbjni-7.7.3.jar
537-
├── seata-compressor-zstd-2.1.0-SNAPSHOT.jar
538-
├── seata-console-2.1.0-SNAPSHOT.jar
539-
├── seata-discovery-all-2.1.0-SNAPSHOT.jar
540-
├── seata-discovery-core-2.1.0-SNAPSHOT.jar
541-
├── seata-discovery-eureka-2.1.0-SNAPSHOT.jar
542-
├── seata-discovery-zk-2.1.0-SNAPSHOT.jar
543-
├── seata-metrics-all-2.1.0-SNAPSHOT.jar
544-
├── seata-metrics-exporter-prometheus-2.1.0-SNAPSHOT.jar
545-
├── seata-serializer-protobuf-2.1.0-SNAPSHOT.jar
546-
├── seata-serializer-seata-2.1.0-SNAPSHOT.jar
547-
├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar
537+
├── seata-compressor-zstd-2.2.0-SNAPSHOT.jar
538+
├── seata-console-2.2.0-SNAPSHOT.jar
539+
├── seata-discovery-all-2.2.0-SNAPSHOT.jar
540+
├── seata-discovery-core-2.2.0-SNAPSHOT.jar
541+
├── seata-discovery-eureka-2.2.0-SNAPSHOT.jar
542+
├── seata-discovery-zk-2.2.0-SNAPSHOT.jar
543+
├── seata-metrics-all-2.2.0-SNAPSHOT.jar
544+
├── seata-metrics-exporter-prometheus-2.2.0-SNAPSHOT.jar
545+
├── seata-serializer-protobuf-2.2.0-SNAPSHOT.jar
546+
├── seata-serializer-seata-2.2.0-SNAPSHOT.jar
547+
├── seata-spring-autoconfigure-core-2.2.0-SNAPSHOT.jar
548548
├── simpleclient_httpserver-0.15.0.jar
549549
├── slf4j-api-1.7.36.jar
550550
├── spring-boot-2.7.17.jar

‎namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ void mockDiscoveryMultiNode() {
168168
String namespace = "public4";
169169
String unitName = String.valueOf(UUID.randomUUID());
170170
NamingServerNode node = new NamingServerNode();
171-
node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
172-
node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
171+
node.setTransaction(new Node.Endpoint("127.0.0.1", 8095, "netty"));
172+
node.setControl(new Node.Endpoint("127.0.0.1", 7095, "http"));
173173
Map<String, Object> meatadata = node.getMetadata();
174174
Map<String,Object> vGroups = new HashMap<>();
175175
vGroups.put("vgroup1",unitName);
176176
meatadata.put(CONSTANT_GROUP, vGroups);
177177
NamingServerNode node2 = new NamingServerNode();
178178
String unitName2 = String.valueOf(UUID.randomUUID());
179-
node2.setTransaction(new Node.Endpoint("127.0.0.1", 8092, "netty"));
180-
node2.setControl(new Node.Endpoint("127.0.0.1", 7092, "http"));
179+
node2.setTransaction(new Node.Endpoint("127.0.0.1", 8096, "netty"));
180+
node2.setControl(new Node.Endpoint("127.0.0.1", 7096, "http"));
181181
vGroups = new HashMap<>();
182182
vGroups.put("vgroup1",unitName2);
183183
node2.getMetadata().put(CONSTANT_GROUP, vGroups);

‎rocketmq/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<groupId>org.apache.seata</groupId>
2525
<artifactId>seata-parent</artifactId>
2626
<version>${revision}</version>
27-
<relativePath>../pom.xml</relativePath>
2827
</parent>
2928
<modelVersion>4.0.0</modelVersion>
3029
<artifactId>seata-rocketmq</artifactId>

0 commit comments

Comments
 (0)