This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new f004b6c Automated deployment: Sat Dec 5 09:08:53 UTC 2020
6835c02cfa6fa1958b327249864d43f60e9a10fc
f004b6c is described below
commit f004b6cb6dd01d38916c2bd2a151222e9fd5e3e0
Author: dailidong <[email protected]>
AuthorDate: Sat Dec 5 09:08:53 2020 +0000
Automated deployment: Sat Dec 5 09:08:53 UTC 2020
6835c02cfa6fa1958b327249864d43f60e9a10fc
---
zh-cn/docs/development/DS-License.html | 57 +++++++++++++++++++++++++++++++++-
zh-cn/docs/development/DS-License.json | 2 +-
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/zh-cn/docs/development/DS-License.html
b/zh-cn/docs/development/DS-License.html
index 7e664f3..160e69b 100644
--- a/zh-cn/docs/development/DS-License.html
+++ b/zh-cn/docs/development/DS-License.html
@@ -38,7 +38,62 @@ copyright notice that is included in or attached to the
work.</p>
<li>在dolphinscheduler-dist/release-docs/NOTICE中追加相关的NOTICE文件,此文件请务必和原代码仓库地址中的NOTICE文件一致。</li>
<li>在dolphinscheduler-dist/release-docs/license/下添加相关源代码的协议,文件命名为license+文件名.txt。</li>
</ul>
-<h3>参考文章</h3>
+<h4>check dependency license fail</h4>
+<pre><code>--- /dev/fd/63 2020-12-03 03:08:57.191579482 +0000
++++ /dev/fd/62 2020-12-03 03:08:57.191579482 +0000
+@@ -1,0 +2 @@
++HikariCP-java6-2.3.13.jar
+@@ -16,0 +18 @@
++c3p0-0.9.5.2.jar
+@@ -149,0 +152 @@
++mchange-commons-java-0.2.11.jar
+Error: Process completed with exit code 1.
+</code></pre>
+<p>一般来讲,添加一个jar的工作往往不会如此轻易的结束,因为它往往依赖了其它各种各样的jar,这些jar我们同样需要添加相应的license。
+这种情况下,我们会在check里面得到 check dependency license
fail的错误信息,如上,我们缺少了HikariCP-java6-2.3.13、c3p0等的license声明,
+按照添加jar的步骤补充即可,提示还是蛮友好的(哈哈)。</p>
+<h3>附件</h3>
+<p>附件:新jar的邮件格式</p>
+<pre><code>[VOTE][New Jar] jetcd-core(registry plugin support etcd3 )
+
+
+(说明目的,以及需要添加的 jar 是什么)Hi, the registry SPI will provide the implementation of
etcd3. Therefore, we need to introduce a new jar (jetcd-core, jetcd-launcher
(test)), which complies with the Apache-2.0 License. I checked his related
dependencies to make sure it complies with the license of the Apache project.
+
+new jar :
+
+jetcd-core version -x.x.x license apache2.0
+
+jetcd-launcher (test) version -x.x.x license apache2.0
+
+dependent jar(它依赖了哪些jar,最好附带版本,以及相关采用的license协议):
+grpc-core version -x.x.x license XXX
+grpc-netty version -x.x.x license XXX
+grpc-protobuf version -x.x.x license XXX
+grpc-stub version -x.x.x license XXX
+grpc-grpclb version -x.x.x license XXX
+netty-all version -x.x.x license XXX
+failsafe version -x.x.x license XXX
+
+相关地址:主要有github地址、license文件地址、notice 文件地址、maven中央仓库地址
+
+github address:https://github.com/etcd-io/jetcd
+
+
+license:https://github.com/etcd-io/jetcd/blob/master/LICENSE
+
+
+notice:https://github.com/etcd-io/jetcd/blob/master/NOTICE
+
+
+Maven repository:
+
+
+https://mvnrepository.com/artifact/io.etcd/jetcd-core
+
+
+https://mvnrepository.com/artifact/io.etcd/jetcd-launcher
+</code></pre>
+<h3>参考文章:</h3>
<ul>
<li><a href="https://apache.org/dev/licensing-howto.html">COMMUNITY-LED
DEVELOPMENT "THE APACHE WAY"</a></li>
<li><a href="https://apache.org/legal/resolved.html">ASF 3RD PARTY LICENSE
POLICY</a></li>
diff --git a/zh-cn/docs/development/DS-License.json
b/zh-cn/docs/development/DS-License.json
index cc1eaca..80dfa4d 100644
--- a/zh-cn/docs/development/DS-License.json
+++ b/zh-cn/docs/development/DS-License.json
@@ -1,6 +1,6 @@
{
"filename": "DS-License.md",
- "__html":
"<h2>DolphinScheduler-Contributor-LICENSE篇</h2>\n<p>如您所知,DolphinScheduler现属于ASF(Apache基金会)下的开源项目,这意味着当您想要成为DolphinScheduler的贡献者的时候,就必须按照Apache的规则来,而Apache对于License有着极其严苛的规则,为了避免贡献者在License上浪费过多的时间,\n本文将为您讲解ASF—License以及参与DolphinScheduler如何过早的规避掉License风险。</p>\n<p>注:本文仅适用于Apache项目。</p>\n<h3>Apache项目可接受的License</h3>\n<p>当您想要为DolphinScheduler(亦或其他Apache项目)增添一个新的功能,这个功能涉及到其他开源软件的引用,那么您必须注意,目前Apache项目支持遵从以下协议的开源软件(如果有遗漏,欢迎补充):</p>\n<p><a
href=\"https://apache.org/legal/resolved.ht [...]
+ "__html":
"<h2>DolphinScheduler-Contributor-LICENSE篇</h2>\n<p>如您所知,DolphinScheduler现属于ASF(Apache基金会)下的开源项目,这意味着当您想要成为DolphinScheduler的贡献者的时候,就必须按照Apache的规则来,而Apache对于License有着极其严苛的规则,为了避免贡献者在License上浪费过多的时间,\n本文将为您讲解ASF—License以及参与DolphinScheduler如何过早的规避掉License风险。</p>\n<p>注:本文仅适用于Apache项目。</p>\n<h3>Apache项目可接受的License</h3>\n<p>当您想要为DolphinScheduler(亦或其他Apache项目)增添一个新的功能,这个功能涉及到其他开源软件的引用,那么您必须注意,目前Apache项目支持遵从以下协议的开源软件(如果有遗漏,欢迎补充):</p>\n<p><a
href=\"https://apache.org/legal/resolved.ht [...]
"link": "/zh-cn/docs/development/DS-License.html",
"meta": {}
}
\ No newline at end of file