From 99627d8fce361172a1225bac5ef4dbe28c628544 Mon Sep 17 00:00:00 2001 From: TengL <49800662+1Teng@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:24:09 +0800 Subject: [PATCH] Fixed some docs error and upgraded netty-all (#4125) * 1.fixed some pages not found errors and typo errors 2.upgraded netty-all to 4.1.86.Final --- .../check-third-party-dependencies.yml | 2 +- CONTRIBUTING.md | 3 +- CONTRIBUTING_CN.md | 3 +- pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 67 ++++++++++--------- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.github/workflows/check-third-party-dependencies.yml b/.github/workflows/check-third-party-dependencies.yml index 8c07313884..bcf4a371c3 100644 --- a/.github/workflows/check-third-party-dependencies.yml +++ b/.github/workflows/check-third-party-dependencies.yml @@ -50,7 +50,7 @@ jobs: sort ${{ github.workspace }}/tool/dependencies/known-dependencies.txt > ~/known-dependencies.txt join -t : -o 1.1 2.1 -a2 ~/known-dependencies.txt ~/current_dependencies.txt > ~/result.txt #print new third-party dependencies name if it exists - awk -F ":" '{if($1=="")print $2" is not in file known-dependencies.txt!\n You can refer to this guide to repair it(你可以参考这个执行进行修复)：https://linkis.apache.org/zh-CN/community/development-specification/license"}' ~/result.txt + awk -F ":" '{if($1=="")print $2" is not in file known-dependencies.txt!\n You can refer to this guide to repair it(你可以参考这个执行进行修复)：https://linkis.apache.org/zh-CN/docs/latest/development/development-specification/license"}' ~/result.txt result=`awk -F ":" '{if($1=="")print $2}' ~/result.txt |wc -l` #if has new third-party,the Action will fail if [[ $result == 0 ]];then echo "All third dependencies is known!" ;else exit 1;fi \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2eb3e45e21..01e68ac2e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -145,7 +145,8 @@ git push origin dev-fix dev-fix - If you still don’t know how to initiate a PR to an open source project, please refer to [About pull requests](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) Whether it is a bug fix or a new feature development, please submit a PR to the dev-* branch -- PR and submission name follow the principle of `(): `, for details, please refer to [Commit message and Change log writing guide](https://linkis.apache.org/docs/1.3.1/development/development-specification/commit-message) + +- PR and submission name follow the principle of `(): `, for details, please refer to [Commit message and Change log writing guide](https://linkis.apache.org/docs/latest/development/development-specification/commit-message) - If the PR contains new features, the document update should be included in this PR - If this PR is not ready to merge, please add [WIP] prefix to the head of the name (WIP = work-in-progress) - All submissions to dev-* branches need to go through at least one review before they can be merged diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md index e6b67f492f..8368d29afa 100644 --- a/CONTRIBUTING_CN.md +++ b/CONTRIBUTING_CN.md @@ -139,7 +139,8 @@ git push origin dev-fix dev-fix - 如果您还不知道怎样向开源项目发起 PR，请参考[About pull requests](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) - 无论是 Bug 修复，还是新功能开发，请将 PR 提交到 dev-* 分支 -- PR 和提交名称遵循 `(): ` 原则，详情可以参考[Commit message 和 Change log 编写指南](https://linkis.apache.org/zh-CN/docs/1.3.1/development/development-specification/commit-message) + +- PR 和提交名称遵循 `(): ` 原则，详情可以参考[Commit message 和 Change log 编写指南](https://linkis.apache.org/zh-CN/docs/latest/development/development-specification/commit-message) - 如果 PR 中包含新功能，理应将文档更新包含在本次 PR 中 - 如果本次 PR 尚未准备好合并，请在名称头部加上 [WIP] 前缀（WIP = work-in-progress） - 所有提交到 dev-* 分支的提交至少需要经过一次 Review 才可以被合并 diff --git a/pom.xml b/pom.xml index 21ff479781..5b2d1fea31 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 2.7.1 30.0-jre - 4.1.78.Final + 4.1.86.Final 2.8.9 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index 3dea93ecd6..b69a34d604 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -370,39 +370,40 @@ netflix-eventbus-0.3.0.jar netflix-infix-0.3.0.jar netflix-statistics-0.1.1.jar netty-3.6.2.Final.jar -netty-all-4.1.78.Final.jar -netty-buffer-4.1.78.Final.jar -netty-codec-4.1.78.Final.jar -netty-codec-dns-4.1.78.Final.jar -netty-codec-haproxy-4.1.78.Final.jar -netty-codec-http-4.1.78.Final.jar -netty-codec-http2-4.1.78.Final.jar -netty-codec-memcache-4.1.78.Final.jar -netty-codec-mqtt-4.1.78.Final.jar -netty-codec-redis-4.1.78.Final.jar -netty-codec-smtp-4.1.78.Final.jar -netty-codec-socks-4.1.78.Final.jar -netty-codec-stomp-4.1.78.Final.jar -netty-codec-xml-4.1.78.Final.jar -netty-common-4.1.78.Final.jar -netty-handler-4.1.78.Final.jar -netty-handler-proxy-4.1.78.Final.jar -netty-resolver-4.1.78.Final.jar -netty-resolver-dns-4.1.78.Final.jar -netty-resolver-dns-classes-macos-4.1.78.Final.jar -netty-resolver-dns-native-macos-4.1.78.Final-osx-aarch_64.jar -netty-resolver-dns-native-macos-4.1.78.Final-osx-x86_64.jar -netty-transport-4.1.78.Final.jar -netty-transport-classes-epoll-4.1.78.Final.jar -netty-transport-classes-kqueue-4.1.78.Final.jar -netty-transport-native-epoll-4.1.78.Final-linux-aarch_64.jar -netty-transport-native-epoll-4.1.78.Final-linux-x86_64.jar -netty-transport-native-kqueue-4.1.78.Final-osx-aarch_64.jar -netty-transport-native-kqueue-4.1.78.Final-osx-x86_64.jar -netty-transport-native-unix-common-4.1.78.Final.jar -netty-transport-rxtx-4.1.78.Final.jar -netty-transport-sctp-4.1.78.Final.jar -netty-transport-udt-4.1.78.Final.jar +netty-all-4.1.86.Final.jar +netty-buffer-4.1.86.Final.jar +netty-codec-4.1.86.Final.jar +netty-codec-dns-4.1.86.Final.jar +netty-codec-haproxy-4.1.86.Final.jar +netty-codec-http-4.1.86.Final.jar +netty-codec-http2-4.1.86.Final.jar +netty-codec-memcache-4.1.86.Final.jar +netty-codec-mqtt-4.1.86.Final.jar +netty-codec-redis-4.1.86.Final.jar +netty-codec-smtp-4.1.86.Final.jar +netty-codec-socks-4.1.86.Final.jar +netty-codec-stomp-4.1.86.Final.jar +netty-codec-xml-4.1.86.Final.jar +netty-common-4.1.86.Final.jar +netty-handler-4.1.86.Final.jar +netty-handler-proxy-4.1.86.Final.jar +netty-handler-ssl-ocsp-4.1.86.Final.jar +netty-resolver-4.1.86.Final.jar +netty-resolver-dns-4.1.86.Final.jar +netty-resolver-dns-classes-macos-4.1.86.Final.jar +netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar +netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar +netty-transport-4.1.86.Final.jar +netty-transport-classes-epoll-4.1.86.Final.jar +netty-transport-classes-kqueue-4.1.86.Final.jar +netty-transport-native-epoll-4.1.86.Final-linux-aarch_64.jar +netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar +netty-transport-native-kqueue-4.1.86.Final-osx-aarch_64.jar +netty-transport-native-kqueue-4.1.86.Final-osx-x86_64.jar +netty-transport-native-unix-common-4.1.86.Final.jar +netty-transport-rxtx-4.1.86.Final.jar +netty-transport-sctp-4.1.86.Final.jar +netty-transport-udt-4.1.86.Final.jar nio-multipart-parser-1.1.0.jar nio-stream-storage-1.1.3.jar objenesis-3.2.jar