This is an automated email from the ASF dual-hosted git repository. xingfudeshi pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push: new 0ad7f3dab0 optimize: add license header (#7232) 0ad7f3dab0 is described below commit 0ad7f3dab06a460e6bfaef656cb05a6361f5f38b Author: jimin <sliev...@163.com> AuthorDate: Mon Mar 24 10:58:41 2025 +0800 optimize: add license header (#7232) --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 16 ++++++++++ .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 16 ++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ .github/workflows/build.yml | 16 ++++++++++ .github/workflows/codeql-analysis.yml | 16 ++++++++++ .github/workflows/license-checker.yaml | 16 ++++++++++ .github/workflows/publish-docker.yml | 16 ++++++++++ .github/workflows/publish-ossrh.yml | 16 ++++++++++ .github/workflows/test-druid.yml | 16 ++++++++++ .github/workflows/test-ubuntu.yml | 16 ++++++++++ .github/workflows/test.yml | 16 ++++++++++ .gitignore | 16 ++++++++++ .licenserc.yaml | 19 ++--------- CHANGELOG.md | 11 ------- CODE_OF_CONDUCT.md | 16 ++++++++++ CONTRIBUTING.md | 16 ++++++++++ CONTRIBUTING_CN.md | 17 ++++++++++ README.md | 16 ++++++++++ SECURITY.md | 16 ++++++++++ changes/en-us/1.4.2.md | 16 ++++++++++ changes/en-us/1.5.0.md | 16 ++++++++++ changes/en-us/1.5.2.md | 16 ++++++++++ changes/en-us/1.6.0.md | 16 ++++++++++ changes/en-us/1.6.1.md | 16 ++++++++++ changes/en-us/1.7.0.md | 16 ++++++++++ changes/en-us/1.7.1.md | 16 ++++++++++ changes/en-us/1.8.0.md | 16 ++++++++++ changes/en-us/2.0.0.md | 16 ++++++++++ changes/en-us/2.1.0.md | 16 ++++++++++ changes/en-us/2.2.0.md | 16 ++++++++++ changes/en-us/2.3.0.md | 16 ++++++++++ changes/en-us/2.x.md | 16 ++++++++++ changes/zh-cn/1.4.2.md | 16 ++++++++++ changes/zh-cn/1.5.0.md | 16 ++++++++++ changes/zh-cn/1.5.2.md | 16 ++++++++++ changes/zh-cn/1.6.0.md | 16 ++++++++++ changes/zh-cn/1.6.1.md | 16 ++++++++++ changes/zh-cn/1.7.0.md | 16 ++++++++++ changes/zh-cn/1.7.1.md | 16 ++++++++++ changes/zh-cn/1.8.0.md | 16 ++++++++++ changes/zh-cn/2.0.0.md | 16 ++++++++++ changes/zh-cn/2.1.0.md | 16 ++++++++++ changes/zh-cn/2.2.0.md | 16 ++++++++++ changes/zh-cn/2.3.0.md | 16 ++++++++++ changes/zh-cn/2.x.md | 16 ++++++++++ compatible/Readme.md | 16 ++++++++++ core/src/main/java/org/apache/seata/core/README.md | 16 ++++++++++ distribution/NOTICE.md | 16 ++++++++++ .../config/agent.config | 15 +++++---- metrics/README.md | 16 ++++++++++ .../src/test/java/org/apache/seata/rm/at/readMe.md | 0 script/config-center/README.md | 16 ++++++++++ server/src/main/resources/README-zh.md | 16 ++++++++++ server/src/main/resources/README.md | 16 ++++++++++ server/src/main/resources/jdbc/README.md | 16 ++++++++++ style/seata_checkstyle.xml | 4 +-- style/seata_codeStyle.xml | 4 +-- style/seata_suppressions.xml | 4 +-- tcc/README.md | 16 ++++++++++ test-old-version/src/test/resources/README.md | 21 ------------ test-old-version/src/test/resources/table.sql | 37 ++++++++++++++++++++++ test/src/test/resources/README.md | 21 ------------ test/src/test/resources/table.sql | 37 ++++++++++++++++++++++ 63 files changed, 920 insertions(+), 86 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index df4e410b98..fc673a0d30 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> --- name: Bug Report diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 972d993399..8c1d98d073 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> --- name: Feature Request diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 32015b26ed..a25badb438 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <!-- Please make sure you have read and understood the contributing guidelines --> - [ ] I have registered the PR [changes](../changes). diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24f0b4b59f..68016bbf35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "build" on: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cb3f87799d..b3c4bed287 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "CodeQL" on: diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml index 87b4b29f38..75174e573c 100644 --- a/.github/workflows/license-checker.yaml +++ b/.github/workflows/license-checker.yaml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: License checker on: diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 5aeb7f02e0..5ae39f61f5 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "Publish Docker Image" on: diff --git a/.github/workflows/publish-ossrh.yml b/.github/workflows/publish-ossrh.yml index 0d5a9f7e73..d424526e6c 100644 --- a/.github/workflows/publish-ossrh.yml +++ b/.github/workflows/publish-ossrh.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "Publish OSSRH" on: false diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml index 75763a5847..05a19db136 100644 --- a/.github/workflows/test-druid.yml +++ b/.github/workflows/test-druid.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "test-druid" on: diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml index 58e52792af..afd2ec3140 100644 --- a/.github/workflows/test-ubuntu.yml +++ b/.github/workflows/test-ubuntu.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "test-ubuntu" on: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af757ebecb..18c9903b80 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# name: "test" on: diff --git a/.gitignore b/.gitignore index b5d777838b..6400c2c9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # maven ignore target/ *.jar diff --git a/.licenserc.yaml b/.licenserc.yaml index 426dffad0a..1d7fb6d62f 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -36,33 +36,18 @@ header: limitations under the License. paths-ignore: - - '.gitignore' - - '*.md' - 'LICENSE' - 'NOTICE' - 'DISCLAIMER' - - '**/*.md' - - '.github/**' - - '**/target/**' - - '**/*.iml' - - 'changes/**' - - 'style/**' - - 'sessionStore/**' - - 'test/src/test/resources/**' - 'saga/seata-saga-statemachine-designer/node_modules/**' - 'node_modules/**' - 'saga/seata-saga-statemachine-designer/**' - - '**/src/test/resources/statelang/**' - 'console/src/main/resources/static/console-fe/**' - '**/org/apache/seata/sqlparser/antlr/**/*.g4' - '**/org/apache/seata/sqlparser/antlr/mysql/parser/*' - - '**/integration/**/*.proto' - 'console/src/main/resources/static/**' - - 'ext/apm-seata-skywalking-plugin/config/agent.config' - - 'server/src/main/resources/lua/redislocker/redislock.lua' - - 'server/src/main/resources/banner.txt' - - 'namingserver/src/main/resources/banner.txt' - - '**/*.json' + - '**/*.txt' #txt files not support comments + - '**/*.json' #json files not support comments comment: on-failure dependency: files: diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 832a91c44a..0000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -## 0.1.0 (Jan. 9, 2019) - -#### FEATURES: - -* support standalone seata-server. -* support mysql automatic transaction. -* support @GlobalTransactional spring annotation. -* support dubbo on filter. -* support mybatis ORM framework. -* support api&template. -* support dubbo,springcloud,motan ect. \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fb337ba0b6..c0b3bc3266 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # Contributor Covenant Code of Conduct ## Our Pledge diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6898d8d16f..216646b897 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # Contributing to Apache Seata(incubating) It is warmly welcomed if you have interest to hack on Apache Seata(incubating). Firstly, we encourage this kind of willingness very much. And here is a list of contributing guides for you. diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md index ac06dd2ffb..864aa6779a 100644 --- a/CONTRIBUTING_CN.md +++ b/CONTRIBUTING_CN.md @@ -1,3 +1,20 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + # 为 Apache Seata(incubating) 做贡献 如果你有兴趣寻找关于Apache Seata(incubating)的漏洞,我们会热烈欢迎。首先,我们非常鼓励这种意愿。这是为您提供的贡献指南列表。 diff --git a/README.md b/README.md index 35db925cac..7a50fde3c0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <div style="align: center"> <img src="https://img.alicdn.com/imgextra/i1/O1CN011z0JfQ2723QgDiWuH_!!6000000007738-2-tps-1497-401.png" height="100" width="426"/> </div> diff --git a/SECURITY.md b/SECURITY.md index 5655e02310..50d0c45bff 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # Security Policy This is a project of the [Apache Software Foundation](https://apache.org) and follows the ASF [vulnerability handling process](https://apache.org/security/#vulnerability-handling). diff --git a/changes/en-us/1.4.2.md b/changes/en-us/1.4.2.md index e03827ecc5..c3d0c88757 100644 --- a/changes/en-us/1.4.2.md +++ b/changes/en-us/1.4.2.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.4.2 [source](https://github.com/seata/seata/archive/v1.4.2.zip) | diff --git a/changes/en-us/1.5.0.md b/changes/en-us/1.5.0.md index 5b5a612ad1..6c2b657b01 100644 --- a/changes/en-us/1.5.0.md +++ b/changes/en-us/1.5.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.5.0 [source](https://github.com/seata/seata/archive/v1.5.0.zip) | diff --git a/changes/en-us/1.5.2.md b/changes/en-us/1.5.2.md index 603e54dc1c..e1b1d54b0f 100644 --- a/changes/en-us/1.5.2.md +++ b/changes/en-us/1.5.2.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.5.2 [source](https://github.com/seata/seata/archive/v1.5.2.zip) | diff --git a/changes/en-us/1.6.0.md b/changes/en-us/1.6.0.md index 1cad7506af..c58effe95e 100644 --- a/changes/en-us/1.6.0.md +++ b/changes/en-us/1.6.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.6.0 [source](https://github.com/seata/seata/archive/v1.6.0.zip) | diff --git a/changes/en-us/1.6.1.md b/changes/en-us/1.6.1.md index 8752dfb972..82d29efcb7 100644 --- a/changes/en-us/1.6.1.md +++ b/changes/en-us/1.6.1.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.6.1 [source](https://github.com/seata/seata/archive/v1.6.1.zip) | diff --git a/changes/en-us/1.7.0.md b/changes/en-us/1.7.0.md index a814973d21..35aab8b906 100644 --- a/changes/en-us/1.7.0.md +++ b/changes/en-us/1.7.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.7.0 [source](https://github.com/seata/seata/archive/v1.7.0.zip) | diff --git a/changes/en-us/1.7.1.md b/changes/en-us/1.7.1.md index 26175750c0..6a2949827f 100644 --- a/changes/en-us/1.7.1.md +++ b/changes/en-us/1.7.1.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> Add changes here for all PR submitted to the develop branch. <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR --> diff --git a/changes/en-us/1.8.0.md b/changes/en-us/1.8.0.md index 8f3426e781..ee4aebbb3e 100644 --- a/changes/en-us/1.8.0.md +++ b/changes/en-us/1.8.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.8.0 [source](https://github.com/seata/seata/archive/v1.8.0.zip) | diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md index 015ecfac60..0b2beb5c39 100644 --- a/changes/en-us/2.0.0.md +++ b/changes/en-us/2.0.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 2.0.0 [source](https://github.com/seata/seata/archive/v2.0.0.zip) | diff --git a/changes/en-us/2.1.0.md b/changes/en-us/2.1.0.md index a8bc01e172..4154d0d6ff 100644 --- a/changes/en-us/2.1.0.md +++ b/changes/en-us/2.1.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> Add changes here for all PR submitted to the 2.x branch. <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR --> diff --git a/changes/en-us/2.2.0.md b/changes/en-us/2.2.0.md index b18658cf51..f0dcdcad09 100644 --- a/changes/en-us/2.2.0.md +++ b/changes/en-us/2.2.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> Add changes here for all PR submitted to the 2.x branch. <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR --> diff --git a/changes/en-us/2.3.0.md b/changes/en-us/2.3.0.md index eeff0411ac..a5a4fc0452 100644 --- a/changes/en-us/2.3.0.md +++ b/changes/en-us/2.3.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 2.3.0 <details> diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 95d8be6eed..e5ae453aba 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> Add changes here for all PR submitted to the 2.x branch. <!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR --> diff --git a/changes/zh-cn/1.4.2.md b/changes/zh-cn/1.4.2.md index 204f9ae04b..979c01cbe0 100644 --- a/changes/zh-cn/1.4.2.md +++ b/changes/zh-cn/1.4.2.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.4.2 [source](https://github.com/seata/seata/archive/v1.4.2.zip) | diff --git a/changes/zh-cn/1.5.0.md b/changes/zh-cn/1.5.0.md index e3d6b23893..d34db280d0 100644 --- a/changes/zh-cn/1.5.0.md +++ b/changes/zh-cn/1.5.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.5.0 [source](https://github.com/seata/seata/archive/v1.5.0.zip) | diff --git a/changes/zh-cn/1.5.2.md b/changes/zh-cn/1.5.2.md index 28bcf08953..032cc045d4 100644 --- a/changes/zh-cn/1.5.2.md +++ b/changes/zh-cn/1.5.2.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.5.2 [source](https://github.com/seata/seata/archive/v1.5.2.zip) | diff --git a/changes/zh-cn/1.6.0.md b/changes/zh-cn/1.6.0.md index 95dcc315c1..97dd88a64c 100644 --- a/changes/zh-cn/1.6.0.md +++ b/changes/zh-cn/1.6.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.6.0 [source](https://github.com/seata/seata/archive/v1.6.0.zip) | diff --git a/changes/zh-cn/1.6.1.md b/changes/zh-cn/1.6.1.md index 23d2dcfde3..ab490f71b3 100644 --- a/changes/zh-cn/1.6.1.md +++ b/changes/zh-cn/1.6.1.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.6.1 [source](https://github.com/seata/seata/archive/v1.6.1.zip) | diff --git a/changes/zh-cn/1.7.0.md b/changes/zh-cn/1.7.0.md index 1e300cc519..a794ee7099 100644 --- a/changes/zh-cn/1.7.0.md +++ b/changes/zh-cn/1.7.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.7.0 [source](https://github.com/seata/seata/archive/v1.7.0.zip) | diff --git a/changes/zh-cn/1.7.1.md b/changes/zh-cn/1.7.1.md index 5cac9b860c..8a10e05b58 100644 --- a/changes/zh-cn/1.7.1.md +++ b/changes/zh-cn/1.7.1.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> 所有提交到 develop 分支的 PR 请在此处登记。 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 --> diff --git a/changes/zh-cn/1.8.0.md b/changes/zh-cn/1.8.0.md index 231ec04106..88b4ad16e1 100644 --- a/changes/zh-cn/1.8.0.md +++ b/changes/zh-cn/1.8.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 1.8.0 [source](https://github.com/seata/seata/archive/v1.8.0.zip) | diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md index 0982e53a3b..2df6aafe08 100644 --- a/changes/zh-cn/2.0.0.md +++ b/changes/zh-cn/2.0.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 2.0.0 [source](https://github.com/seata/seata/archive/v2.0.0.zip) | diff --git a/changes/zh-cn/2.1.0.md b/changes/zh-cn/2.1.0.md index b7a4f9bbc0..daac1af8ad 100644 --- a/changes/zh-cn/2.1.0.md +++ b/changes/zh-cn/2.1.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> 所有提交到 2.x 分支的 PR 请在此处登记。 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 --> diff --git a/changes/zh-cn/2.2.0.md b/changes/zh-cn/2.2.0.md index 3a951142ef..01f6a2b825 100644 --- a/changes/zh-cn/2.2.0.md +++ b/changes/zh-cn/2.2.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> 所有提交到 2.x 分支的 PR 请在此处登记。 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 --> diff --git a/changes/zh-cn/2.3.0.md b/changes/zh-cn/2.3.0.md index 3cba0e59ed..b4f5515fd1 100644 --- a/changes/zh-cn/2.3.0.md +++ b/changes/zh-cn/2.3.0.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### 2.3.0 <details> diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 4927801e9b..540736187b 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> 所有提交到 2.x 分支的 PR 请在此处登记。 <!-- 请根据PR的类型添加 `变更记录` 到以下对应位置(feature/bugfix/optimize/test) 下 --> diff --git a/compatible/Readme.md b/compatible/Readme.md index 58906f4800..80be14e061 100644 --- a/compatible/Readme.md +++ b/compatible/Readme.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### Seata-compatible Starting from version 2.1.x, Seata's package name has been changed from "io.seata" to "org.apache.seata". To assist users with a smooth upgrade from older versions, we have implemented compatibility for the following commonly used APIs. - RootContext diff --git a/core/src/main/java/org/apache/seata/core/README.md b/core/src/main/java/org/apache/seata/core/README.md index 44f2f5d494..cace3a709a 100644 --- a/core/src/main/java/org/apache/seata/core/README.md +++ b/core/src/main/java/org/apache/seata/core/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ## request rm client -> server diff --git a/distribution/NOTICE.md b/distribution/NOTICE.md index c1c82dd611..2454f761b7 100644 --- a/distribution/NOTICE.md +++ b/distribution/NOTICE.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> Due to license compatibility issues, we cannot include jar dependencies such as mysql, mariadb, oracle, etc., in the distribution package. Please copy database driver dependencies, such as `mysql-connector-java.jar`, to this directory. The following is an example of a directory structure: diff --git a/ext/apm-seata-skywalking-plugin/config/agent.config b/ext/apm-seata-skywalking-plugin/config/agent.config index f73bc60185..fa5b11064a 100644 --- a/ext/apm-seata-skywalking-plugin/config/agent.config +++ b/ext/apm-seata-skywalking-plugin/config/agent.config @@ -1,10 +1,10 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # @@ -13,6 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # The agent namespace # agent.namespace=${SW_AGENT_NAMESPACE:default-namespace} diff --git a/metrics/README.md b/metrics/README.md index 6ae32aba5a..61f942c49c 100644 --- a/metrics/README.md +++ b/metrics/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### Metrics #### 设计思路 1. Seata作为一个被集成的数据一致性框架,Metrics模块将尽可能少的使用第三方依赖以降低发生冲突的风险; diff --git a/rm-datasource/src/test/java/org/apache/seata/rm/at/readMe.md b/rm-datasource/src/test/java/org/apache/seata/rm/at/readMe.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/script/config-center/README.md b/script/config-center/README.md index 382000a539..16092cb264 100644 --- a/script/config-center/README.md +++ b/script/config-center/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # Script usage demo  diff --git a/server/src/main/resources/README-zh.md b/server/src/main/resources/README-zh.md index e9baff03ba..7272af659b 100644 --- a/server/src/main/resources/README-zh.md +++ b/server/src/main/resources/README-zh.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # 脚本说明 ## [client](https://github.com/apache/incubator-seata/tree/develop/script/client) diff --git a/server/src/main/resources/README.md b/server/src/main/resources/README.md index eabba7aeb5..1ee9e4408c 100644 --- a/server/src/main/resources/README.md +++ b/server/src/main/resources/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> # Script Description ## [client](https://github.com/apache/incubator-seata/tree/develop/script/client) diff --git a/server/src/main/resources/jdbc/README.md b/server/src/main/resources/jdbc/README.md index cd2a4993b0..6fb33a7358 100644 --- a/server/src/main/resources/jdbc/README.md +++ b/server/src/main/resources/jdbc/README.md @@ -1 +1,17 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> PLEASE DO NOT REMOVE THIS FOLDER diff --git a/style/seata_checkstyle.xml b/style/seata_checkstyle.xml index 4e8aca1d23..091715d456 100644 --- a/style/seata_checkstyle.xml +++ b/style/seata_checkstyle.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -8,14 +7,13 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" diff --git a/style/seata_codeStyle.xml b/style/seata_codeStyle.xml index 3a9729f895..b928048b98 100644 --- a/style/seata_codeStyle.xml +++ b/style/seata_codeStyle.xml @@ -1,5 +1,4 @@ <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -7,14 +6,13 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> <code_scheme name="Seata"> <option name="USE_SAME_INDENTS" value="true"/> diff --git a/style/seata_suppressions.xml b/style/seata_suppressions.xml index 82e8cba996..dcb0976bc5 100644 --- a/style/seata_suppressions.xml +++ b/style/seata_suppressions.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -8,14 +7,13 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> <!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN" diff --git a/tcc/README.md b/tcc/README.md index 0d3e72a5ce..01013df90b 100644 --- a/tcc/README.md +++ b/tcc/README.md @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> ### TCC diff --git a/test-old-version/src/test/resources/README.md b/test-old-version/src/test/resources/README.md deleted file mode 100644 index c162008b3b..0000000000 --- a/test-old-version/src/test/resources/README.md +++ /dev/null @@ -1,21 +0,0 @@ -## MySQLUpdateJoinTest -##测试表结构 -CREATE TABLE `t` ( -`id` int NOT NULL, -`a` int DEFAULT NULL, -`c` int DEFAULT NULL, -PRIMARY KEY (`id`), -KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `t1` ( -`id` int NOT NULL, -`a` int DEFAULT NULL, -`b` int DEFAULT NULL, -`c` int DEFAULT NULL, -PRIMARY KEY (`id`), -KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 -###测试数据 -insert into t(id,a,c) values(1,1,1);\ -insert into t1(id,a,b,c) values(2,1,2,2) \ No newline at end of file diff --git a/test-old-version/src/test/resources/table.sql b/test-old-version/src/test/resources/table.sql new file mode 100644 index 0000000000..c41e0064dd --- /dev/null +++ b/test-old-version/src/test/resources/table.sql @@ -0,0 +1,37 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one or more +-- contributor license agreements. See the NOTICE file distributed with +-- this work for additional information regarding copyright ownership. +-- The ASF licenses this file to You under the Apache License, Version 2.0 +-- (the "License"); you may not use this file except in compliance with +-- the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +-- MySQLUpdateJoinTest +CREATE TABLE `t` ( +`id` int NOT NULL, +`a` int DEFAULT NULL, +`c` int DEFAULT NULL, +PRIMARY KEY (`id`), +KEY `a` (`a`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `t1` ( +`id` int NOT NULL, +`a` int DEFAULT NULL, +`b` int DEFAULT NULL, +`c` int DEFAULT NULL, +PRIMARY KEY (`id`), +KEY `a` (`a`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 +-- test data +insert into t(id,a,c) values(1,1,1);\ +insert into t1(id,a,b,c) values(2,1,2,2) \ No newline at end of file diff --git a/test/src/test/resources/README.md b/test/src/test/resources/README.md deleted file mode 100644 index c162008b3b..0000000000 --- a/test/src/test/resources/README.md +++ /dev/null @@ -1,21 +0,0 @@ -## MySQLUpdateJoinTest -##测试表结构 -CREATE TABLE `t` ( -`id` int NOT NULL, -`a` int DEFAULT NULL, -`c` int DEFAULT NULL, -PRIMARY KEY (`id`), -KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `t1` ( -`id` int NOT NULL, -`a` int DEFAULT NULL, -`b` int DEFAULT NULL, -`c` int DEFAULT NULL, -PRIMARY KEY (`id`), -KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 -###测试数据 -insert into t(id,a,c) values(1,1,1);\ -insert into t1(id,a,b,c) values(2,1,2,2) \ No newline at end of file diff --git a/test/src/test/resources/table.sql b/test/src/test/resources/table.sql new file mode 100644 index 0000000000..0ca6d57332 --- /dev/null +++ b/test/src/test/resources/table.sql @@ -0,0 +1,37 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one or more +-- contributor license agreements. See the NOTICE file distributed with +-- this work for additional information regarding copyright ownership. +-- The ASF licenses this file to You under the Apache License, Version 2.0 +-- (the "License"); you may not use this file except in compliance with +-- the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- MySQLUpdateJoinTest +CREATE TABLE `t` ( +`id` int NOT NULL, +`a` int DEFAULT NULL, +`c` int DEFAULT NULL, +PRIMARY KEY (`id`), +KEY `a` (`a`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `t1` ( +`id` int NOT NULL, +`a` int DEFAULT NULL, +`b` int DEFAULT NULL, +`c` int DEFAULT NULL, +PRIMARY KEY (`id`), +KEY `a` (`a`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 + +-- test data +insert into t(id,a,c) values(1,1,1);\ +insert into t1(id,a,b,c) values(2,1,2,2) \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org For additional commands, e-mail: notifications-h...@seata.apache.org