Skip to content

Commit 99627d8

Browse files
authoredFeb 1, 2023
Fixed some docs error and upgraded netty-all (apache#4125)
* 1.fixed some pages not found errors and typo errors 2.upgraded netty-all to 4.1.86.Final
1 parent e759061 commit 99627d8

File tree

5 files changed

+40
-37
lines changed

5 files changed

+40
-37
lines changed
 

‎.github/workflows/check-third-party-dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
sort ${{ github.workspace }}/tool/dependencies/known-dependencies.txt > ~/known-dependencies.txt
5151
join -t : -o 1.1 2.1 -a2 ~/known-dependencies.txt ~/current_dependencies.txt > ~/result.txt
5252
#print new third-party dependencies name if it exists
53-
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
53+
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
5454
result=`awk -F ":" '{if($1=="")print $2}' ~/result.txt |wc -l`
5555
#if has new third-party,the Action will fail
5656
if [[ $result == 0 ]];then echo "All third dependencies is known!" ;else exit 1;fi

‎CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ git push origin dev-fix dev-fix
145145

146146
- 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)
147147
Whether it is a bug fix or a new feature development, please submit a PR to the dev-* branch
148-
- PR and submission name follow the principle of `<type>(<scope>): <subject>`, 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)
148+
149+
- PR and submission name follow the principle of `<type>(<scope>): <subject>`, for details, please refer to [Commit message and Change log writing guide](https://linkis.apache.org/docs/latest/development/development-specification/commit-message)
149150
- If the PR contains new features, the document update should be included in this PR
150151
- If this PR is not ready to merge, please add [WIP] prefix to the head of the name (WIP = work-in-progress)
151152
- All submissions to dev-* branches need to go through at least one review before they can be merged

‎CONTRIBUTING_CN.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ git push origin dev-fix dev-fix
139139

140140
- 如果您还不知道怎样向开源项目发起 PR,请参考[About pull requests](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
141141
- 无论是 Bug 修复,还是新功能开发,请将 PR 提交到 dev-* 分支
142-
- PR 和提交名称遵循 `<type>(<scope>): <subject>` 原则,详情可以参考[Commit message 和 Change log 编写指南](https://linkis.apache.org/zh-CN/docs/1.3.1/development/development-specification/commit-message)
142+
143+
- PR 和提交名称遵循 `<type>(<scope>): <subject>` 原则,详情可以参考[Commit message 和 Change log 编写指南](https://linkis.apache.org/zh-CN/docs/latest/development/development-specification/commit-message)
143144
- 如果 PR 中包含新功能,理应将文档更新包含在本次 PR 中
144145
- 如果本次 PR 尚未准备好合并,请在名称头部加上 [WIP] 前缀(WIP = work-in-progress)
145146
- 所有提交到 dev-* 分支的提交至少需要经过一次 Review 才可以被合并

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<!-- hadoop 2.7 use curator 2.7.1, hadoop3.3 use curator 4.2.0-->
109109
<curator.version>2.7.1</curator.version>
110110
<guava.version>30.0-jre</guava.version>
111-
<netty.version>4.1.78.Final</netty.version>
111+
<netty.version>4.1.86.Final</netty.version>
112112

113113
<!-- json -->
114114
<gson.version>2.8.9</gson.version>

‎tool/dependencies/known-dependencies.txt

+34-33
Original file line numberDiff line numberDiff line change
@@ -370,39 +370,40 @@ netflix-eventbus-0.3.0.jar
370370
netflix-infix-0.3.0.jar
371371
netflix-statistics-0.1.1.jar
372372
netty-3.6.2.Final.jar
373-
netty-all-4.1.78.Final.jar
374-
netty-buffer-4.1.78.Final.jar
375-
netty-codec-4.1.78.Final.jar
376-
netty-codec-dns-4.1.78.Final.jar
377-
netty-codec-haproxy-4.1.78.Final.jar
378-
netty-codec-http-4.1.78.Final.jar
379-
netty-codec-http2-4.1.78.Final.jar
380-
netty-codec-memcache-4.1.78.Final.jar
381-
netty-codec-mqtt-4.1.78.Final.jar
382-
netty-codec-redis-4.1.78.Final.jar
383-
netty-codec-smtp-4.1.78.Final.jar
384-
netty-codec-socks-4.1.78.Final.jar
385-
netty-codec-stomp-4.1.78.Final.jar
386-
netty-codec-xml-4.1.78.Final.jar
387-
netty-common-4.1.78.Final.jar
388-
netty-handler-4.1.78.Final.jar
389-
netty-handler-proxy-4.1.78.Final.jar
390-
netty-resolver-4.1.78.Final.jar
391-
netty-resolver-dns-4.1.78.Final.jar
392-
netty-resolver-dns-classes-macos-4.1.78.Final.jar
393-
netty-resolver-dns-native-macos-4.1.78.Final-osx-aarch_64.jar
394-
netty-resolver-dns-native-macos-4.1.78.Final-osx-x86_64.jar
395-
netty-transport-4.1.78.Final.jar
396-
netty-transport-classes-epoll-4.1.78.Final.jar
397-
netty-transport-classes-kqueue-4.1.78.Final.jar
398-
netty-transport-native-epoll-4.1.78.Final-linux-aarch_64.jar
399-
netty-transport-native-epoll-4.1.78.Final-linux-x86_64.jar
400-
netty-transport-native-kqueue-4.1.78.Final-osx-aarch_64.jar
401-
netty-transport-native-kqueue-4.1.78.Final-osx-x86_64.jar
402-
netty-transport-native-unix-common-4.1.78.Final.jar
403-
netty-transport-rxtx-4.1.78.Final.jar
404-
netty-transport-sctp-4.1.78.Final.jar
405-
netty-transport-udt-4.1.78.Final.jar
373+
netty-all-4.1.86.Final.jar
374+
netty-buffer-4.1.86.Final.jar
375+
netty-codec-4.1.86.Final.jar
376+
netty-codec-dns-4.1.86.Final.jar
377+
netty-codec-haproxy-4.1.86.Final.jar
378+
netty-codec-http-4.1.86.Final.jar
379+
netty-codec-http2-4.1.86.Final.jar
380+
netty-codec-memcache-4.1.86.Final.jar
381+
netty-codec-mqtt-4.1.86.Final.jar
382+
netty-codec-redis-4.1.86.Final.jar
383+
netty-codec-smtp-4.1.86.Final.jar
384+
netty-codec-socks-4.1.86.Final.jar
385+
netty-codec-stomp-4.1.86.Final.jar
386+
netty-codec-xml-4.1.86.Final.jar
387+
netty-common-4.1.86.Final.jar
388+
netty-handler-4.1.86.Final.jar
389+
netty-handler-proxy-4.1.86.Final.jar
390+
netty-handler-ssl-ocsp-4.1.86.Final.jar
391+
netty-resolver-4.1.86.Final.jar
392+
netty-resolver-dns-4.1.86.Final.jar
393+
netty-resolver-dns-classes-macos-4.1.86.Final.jar
394+
netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar
395+
netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar
396+
netty-transport-4.1.86.Final.jar
397+
netty-transport-classes-epoll-4.1.86.Final.jar
398+
netty-transport-classes-kqueue-4.1.86.Final.jar
399+
netty-transport-native-epoll-4.1.86.Final-linux-aarch_64.jar
400+
netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
401+
netty-transport-native-kqueue-4.1.86.Final-osx-aarch_64.jar
402+
netty-transport-native-kqueue-4.1.86.Final-osx-x86_64.jar
403+
netty-transport-native-unix-common-4.1.86.Final.jar
404+
netty-transport-rxtx-4.1.86.Final.jar
405+
netty-transport-sctp-4.1.86.Final.jar
406+
netty-transport-udt-4.1.86.Final.jar
406407
nio-multipart-parser-1.1.0.jar
407408
nio-stream-storage-1.1.3.jar
408409
objenesis-3.2.jar

0 commit comments

Comments
 (0)
Please sign in to comment.