This is an automated email from the ASF dual-hosted git repository.

journey pushed a commit to branch 1.2.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.2.1-release by this push:
     new fddf4ef  check license and update (#1725)
fddf4ef is described below

commit fddf4ef95d458ecc1cec793a36e221b0f721e47c
Author: lgcareer <[email protected]>
AuthorDate: Mon Jan 6 16:02:19 2020 +0800

    check license and update (#1725)
---
 dolphinscheduler-dist/release-docs/LICENSE | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-dist/release-docs/LICENSE 
b/dolphinscheduler-dist/release-docs/LICENSE
index 97946d1..9d409c2 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -209,6 +209,15 @@ subcomponents is subject to the terms and conditions of 
the following
 licenses.
 
 ========================================================================
+Apache 1.1 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project 
link for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+    commons-el 1.0: http://commons.apache.org/dormant/commons-el/, Apache 1.1
+
+========================================================================
 Apache 2.0 licenses
 ========================================================================
 
@@ -233,9 +242,8 @@ The text of each license is also included at 
licenses/LICENSE-[project].txt.
     commons-collections4 4.1: 
https://mvnrepository.com/artifact/org.apache.commons/commons-collections4/4.1, 
Apache 2.0
     commons-compress 1.4.1: 
https://mvnrepository.com/artifact/org.apache.commons/commons-compress/1.4.1, 
Apache 2.0
     commons-configuration 1.10: 
https://mvnrepository.com/artifact/commons-configuration/commons-configuration/1.10,
 Apache 2.0
-    commons-daemon 1.0.13 
https://mvnrepository.com/artifact/commons-daemon/commons-daemon/1.0.13, Apache 
2.0
+    commons-daemon 1.0.13: 
https://mvnrepository.com/artifact/commons-daemon/commons-daemon/1.0.13, Apache 
2.0
     commons-dbcp 1.4: https://github.com/apache/commons-dbcp, Apache 2.0
-    commons-el 1.0: 
https://mvnrepository.com/artifact/commons-el/commons-el/1.0, Apache 2.0
     commons-email 1.5: https://github.com/apache/commons-email, Apache 2.0
     commons-httpclient 3.0.1: 
https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient/3.0.1, 
Apache 2.0
     commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
@@ -267,7 +275,7 @@ The text of each license is also included at 
licenses/LICENSE-[project].txt.
     guava 20.0: 
https://mvnrepository.com/artifact/com.google.guava/guava/20.0, Apache 2.0
     guice 3.0: https://mvnrepository.com/artifact/com.google.inject/guice/3.0, 
Apache 2.0
     guice-servlet 3.0: 
https://mvnrepository.com/artifact/com.google.inject.extensions/guice-servlet/3.0,
 Apache 2.0
-    hadoop-annotations 
2.7.3:https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations/2.7.3,
 Apache 2.0
+    hadoop-annotations 2.7.3: 
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations/2.7.3, 
Apache 2.0
     hadoop-auth 2.7.3: 
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-auth/2.7.3, Apache 
2.0
     hadoop-aws 2.7.3: 
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/2.7.3, Apache 
2.0
     hadoop-client 2.7.3: 
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-client/2.7.3, 
Apache 2.0
@@ -340,7 +348,7 @@ The text of each license is also included at 
licenses/LICENSE-[project].txt.
     log4j-1.2-api 2.11.2: 
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.11.2,
 Apache 2.0
     lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, 
Apache 2.0
     mapstruct 1.2.0.Final: https://github.com/mapstruct/mapstruct, Apache 2.0
-    mybatis 3.5.2 
https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.2, Apache 2.0
+    mybatis 3.5.2: 
https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.2, Apache 2.0
     mybatis-plus 3.2.0: https://github.com/baomidou/mybatis-plus, Apache 2.0
     mybatis-plus-annotation 3.2.0: 
https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-annotation/3.2.0, 
Apache 2.0
     mybatis-plus-boot-starter 3.2.0: 
https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter/3.2.0,
 Apache 2.0
@@ -436,7 +444,7 @@ CDDL licenses
 The following components are provided under the CDDL License. See project link 
for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    activation 1.1: 
https://mvnrepository.com/artifact/javax.activation/activation/1.1 CDDL 1.0
+    activation 1.1: 
https://mvnrepository.com/artifact/javax.activation/activation/1.1, CDDL 1.0
     javax.activation-api 1.2.0: 
https://mvnrepository.com/artifact/javax.activation/javax.activation-api/1.2.0, 
CDDL and LGPL 2.0
     javax.annotation-api 1.3.2: 
https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api/1.3.2, 
CDDL + GPLv2
     javax.mail 1.6.2: 
https://mvnrepository.com/artifact/com.sun.mail/javax.mail/1.6.2, CDDL/GPLv2
@@ -459,7 +467,7 @@ EPL licenses
 The following components are provided under the EPL License. See project link 
for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    aspectjweaver 
1.9.2:https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.2, EPL 
1.0
+    aspectjweaver 1.9.2: 
https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.2, EPL 1.0
     logback-classic 1.2.3: 
https://mvnrepository.com/artifact/ch.qos.logback/logback-classic/1.2.3, EPL 
1.0 and LGPL 2.1
     logback-core 1.2.3: 
https://mvnrepository.com/artifact/ch.qos.logback/logback-core/1.2.3, EPL 1.0 
and LGPL 2.1
     oshi-core 3.5.0: 
https://mvnrepository.com/artifact/com.github.oshi/oshi-core/3.5.0, EPL 1.0

Reply via email to