Skip to content

Commit ce19a67

Browse files
authored
Merge branch '2.x' into 2.x_25_10_17_01
2 parents 6e5571e + 49f0bc2 commit ce19a67

5 files changed

Lines changed: 5 additions & 42 deletions

File tree

changes/en-us/2.x.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Add changes here for all PR submitted to the 2.x branch.
6464
- [[#7443](https://github.com/seata/seata/pull/7443)] Replace @LocalTCC with @SagaTransactional in the saga annotation pattern
6565
- [[#7645](https://github.com/seata/seata/pull/7645)] simplifying the relevant transport.* configuration types
6666
- [[#7673](https://github.com/apache/incubator-seata/pull/7673)] bump @babel/runtime from ^7.26.10 to ^7.27.0
67+
- [[#7689](https://github.com/apache/incubator-seata/pull/7689)] optimize source release
6768

6869

6970
### security:

changes/zh-cn/2.x.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
- [[#7443](https://github.com/seata/seata/pull/7443)] 将saga注释模式中的@LocalTCC替换为@SagaTransactional
6464
- [[#7645](https://github.com/seata/seata/pull/7645)] 简化相关的 transport.* 配置项类型
6565
- [[#7673](https://github.com/apache/incubator-seata/pull/7673)] 升级 @babel/runtime ^7.26.10 到 ^7.27.0
66+
- [[#7689](https://github.com/apache/incubator-seata/pull/7689)] 优化 source release
6667

6768

6869
### security:

distribution/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<configuration>
6565
<descriptors>
6666
<descriptor>release-seata.xml</descriptor>
67+
<descriptor>source-release.xml</descriptor>
6768
</descriptors>
6869
</configuration>
6970
<executions>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@
4949
</excludes>
5050
</fileSet>
5151
</fileSets>
52-
</assembly>
52+
</assembly>

pom.xml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -289,54 +289,14 @@
289289
<!-- profile: source-release -->
290290
<profile>
291291
<id>source-release</id>
292-
<modules>
293-
<module>build</module>
294-
<module>all</module>
295-
<module>bom</module>
296-
<module>common</module>
297-
<module>config</module>
298-
<module>console</module>
299-
<module>core</module>
300-
<module>compatible</module>
301-
<module>dependencies</module>
302-
<module>discovery</module>
303-
<module>integration/rpc-core</module>
304-
<module>integration/dubbo</module>
305-
<module>integration/dubbo-alibaba</module>
306-
<module>integration/sofa-rpc</module>
307-
<module>integration/motan</module>
308-
<module>integration/grpc</module>
309-
<module>integration/http</module>
310-
<module>integration/http-jakarta</module>
311-
<module>integration/hsf</module>
312-
<module>integration/brpc</module>
313-
<module>rm</module>
314-
<module>rm-datasource</module>
315-
<module>rocketmq</module>
316-
<module>spring</module>
317-
<module>tcc</module>
318-
<module>mock-server</module>
319-
<module>tm</module>
320-
<module>metrics</module>
321-
<module>serializer</module>
322-
<module>seata-spring-boot-starter</module>
323-
<module>seata-spring-autoconfigure</module>
324-
<module>compressor</module>
325-
<module>saga</module>
326-
<module>sqlparser</module>
327-
<module>server</module>
328-
<module>ext/apm-seata-skywalking-plugin</module>
329-
<module>integration-tx-api</module>
330-
<module>namingserver</module>
331-
</modules>
332292
<build>
333293
<plugins>
334294
<plugin>
335295
<groupId>org.apache.maven.plugins</groupId>
336296
<artifactId>maven-assembly-plugin</artifactId>
337297
<configuration>
338298
<descriptors>
339-
<descriptor>src/assembly/source-release.xml</descriptor>
299+
<descriptor>distribution/source-release.xml</descriptor>
340300
</descriptors>
341301
<finalName>apache-seata-${project.version}-incubating-src</finalName>
342302
</configuration>

0 commit comments

Comments
 (0)