Skip to content

Commit 87c1696

Browse files
authored
optimize: remove incompatible licenses at build time (apache#6905)
1 parent 5752786 commit 87c1696

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

changes/en-us/2.x.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Add changes here for all PR submitted to the 2.x branch.
44

55
### feature:
66

7-
- [[#6876](https://github.com/apache/incubator-seata/pull/6876)]support kingbase
8-
- [[#6881](https://github.com/apache/incubator-seata/pull/6881)]support grpc
9-
- [[#6864](https://github.com/apache/incubator-seata/pull/6864)]support shentong database
7+
- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] support kingbase
8+
- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] support grpc
9+
- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] support shentong database
1010

1111
### bugfix:
1212
- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
@@ -23,9 +23,11 @@ Add changes here for all PR submitted to the 2.x branch.
2323
- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
2424
- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
2525
- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
26+
- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
2627
- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope
2728

2829

30+
2931
### refactor:
3032

3133
### security:

changes/zh-cn/2.x.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 -->
44

55
### feature:
6-
- [[#6876](https://github.com/apache/incubator-seata/pull/6876)]支持人大金仓数据库(kingbase)
7-
- [[#6881](https://github.com/apache/incubator-seata/pull/6881)]全链路支持grpc
8-
- [[#6864](https://github.com/apache/incubator-seata/pull/6864)]支持神通数据库(oscar)
6+
- [[#6876](https://github.com/apache/incubator-seata/pull/6876)] 支持人大金仓数据库(kingbase)
7+
- [[#6881](https://github.com/apache/incubator-seata/pull/6881)] client和server支持grpc协议
8+
- [[#6864](https://github.com/apache/incubator-seata/pull/6864)] 支持神通数据库(oscar)
99

1010

1111
### bugfix:
@@ -25,6 +25,7 @@
2525
- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] 修复日志参数不匹配问题
2626
- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本
2727
- [[#6902](https://github.com/apache/incubator-seata/pull/6900)] 优化 readme 文档
28+
- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] 移除构建期不兼容的 license
2829
- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2依赖添加test scope
2930

3031

distribution/LICENSE

-6
Original file line numberDiff line numberDiff line change
@@ -490,12 +490,6 @@ BSD-3-Clause licenses
490490
org.antlr:antlr4-runtime 4.8 BSD-3-Clause
491491
org.abego.treelayout:org.abego.treelayout.core 1.0.3 BSD-3-Clause
492492

493-
========================================================================
494-
CC-BY-4.0 licenses
495-
========================================================================
496-
497-
caniuse-lite 1.0.30001589 CC-BY-4.0
498-
499493
========================================================================
500494
CDDL-1.0 licenses
501495
========================================================================

0 commit comments

Comments
 (0)