Skip to content

Commit 9acdb95

Browse files
slievrlyslievrly
committed
optimize: optimize multiple licenses and remove license urls (apache#6653)
1 parent 9714f90 commit 9acdb95

File tree

1 file changed

+40
-104
lines changed

1 file changed

+40
-104
lines changed

‎distribution/LICENSE

Lines changed: 40 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,10 @@ subcomponents is subject to the terms and conditions of the following
209209
licenses.
210210

211211
========================================================================
212-
(MIT AND BSD-3-Clause) licenses
212+
Apache-1.1 licenses
213213
========================================================================
214214

215-
sha.js 2.4.11 (MIT AND BSD-3-Clause)
216-
217-
========================================================================
218-
0BSD licenses
219-
========================================================================
220-
221-
tslib 2.6.2 0BSD
215+
com.caucho:hessian 4.0.63 Apache-1.1
222216

223217
========================================================================
224218
Apache-2.0 licenses
@@ -493,6 +487,10 @@ Apache-2.0 licenses
493487
org.apache.zookeeper:zookeeper 3.7.2 Apache-2.0
494488
org.apache.zookeeper:zookeeper-jute 3.7.2 Apache-2.0
495489
org.apache.skywalking 8.4.0 Apache-2.0
490+
org.apache.tomcat.embed:tomcat-embed-core 9.0.83 Apache-2.0
491+
org.apache.tomcat.embed:tomcat-embed-core 9.0.82 Apache-2.0
492+
net.java.dev.jna:jna 5.5.0 Apache-2.0
493+
org.rocksdb:rocksdbjni 8.8.1 Apache-2.0
496494

497495

498496
========================================================================
@@ -528,19 +526,13 @@ Apache-2.0 and BSD-3-Clause licenses
528526
org.springframework:spring-webmvc 5.3.26 Apache-2.0 and BSD-3-Clause
529527
org.springframework:spring-webmvc 5.3.30 Apache-2.0 and BSD-3-Clause
530528

531-
========================================================================
532-
Apache-2.0 and CDDL-1.0 licenses
533-
========================================================================
534-
535-
org.apache.tomcat.embed:tomcat-embed-core 9.0.83 Apache-2.0 and CDDL-1.0
536-
org.apache.tomcat.embed:tomcat-embed-core 9.0.82 Apache-2.0 and CDDL-1.0
537-
538529
========================================================================
539530
BSD-2-Clause licenses
540531
========================================================================
541532

542533
org.postgresql:postgresql 42.3.8 BSD-2-Clause
543534
webidl-conversions 3.0.1 BSD-2-Clause
535+
com.github.luben:zstd-jni 1.5.0-4 BSD 2-Clause
544536

545537
========================================================================
546538
BSD-3-Clause licenses
@@ -599,6 +591,15 @@ BSD-3-Clause licenses
599591
org.antlr:antlr-runtime 3.5.2 The BSD License
600592
org.antlr:antlr-runtime 3.4 The BSD License
601593
org.antlr:antlr4 4.8 The BSD License
594+
org.codehaus.janino:commons-compiler 3.1.10 BSD-3-Clause
595+
org.codehaus.janino:commons-compiler 3.1.10 BSD-3-Clause
596+
org.codehaus.janino:commons-compiler 3.1.9 BSD-3-Clause
597+
org.codehaus.janino:janino 3.1.10 BSD-3-Clause
598+
org.codehaus.janino:janino 3.1.7 BSD-3-Clause
599+
org.antlr:stringtemplate 3.2.1 BSD-3-Clause
600+
antlr:antlr 2.7.7 BSD-3-Clause
601+
org.antlr:antlr4-runtime 4.8 BSD-3-Clause
602+
org.abego.treelayout:org.abego.treelayout.core 1.0.3 BSD-3-Clause
602603

603604
========================================================================
604605
CC-BY-4.0 licenses
@@ -607,25 +608,30 @@ CC-BY-4.0 licenses
607608
caniuse-lite 1.0.30001589 CC-BY-4.0
608609

609610
========================================================================
610-
CDDL-1.0 and GPL-2.0 licenses
611+
CDDL-1.0 licenses
611612
========================================================================
612613

613-
javax.servlet:javax.servlet-api 4.0.1 CDDL-1.0 and GPL-2.0
614+
javax.servlet:javax.servlet-api 4.0.1 CDDL-1.0
615+
javax.ws.rs:jsr311-api 1.1.1 CDDL-1.0
616+
org.glassfish:javax.json 1.0.4 CDDL-1.0
617+
com.sun.jersey.contribs:jersey-apache-client4 1.19.1 CDDL-1.0
618+
com.sun.jersey:jersey-client 1.19.1 CDDL-1.0
619+
com.sun.jersey:jersey-core 1.19.1 CDDL-1.0
614620

615621
========================================================================
616-
EPL-1.0 and LGPL-2.1 licenses
622+
EPL-1.0 licenses
617623
========================================================================
618624

619-
ch.qos.logback:logback-classic 1.2.12 EPL-1.0 and LGPL-2.1
620-
ch.qos.logback:logback-classic 1.3.14 EPL-1.0 and LGPL-2.1
621-
ch.qos.logback:logback-core 1.2.12 EPL-1.0 and LGPL-2.1
622-
ch.qos.logback:logback-core 1.3.14 EPL-1.0 and LGPL-2.1
625+
ch.qos.logback:logback-classic 1.2.12 EPL-1.0
626+
ch.qos.logback:logback-classic 1.3.14 EPL-1.0
627+
ch.qos.logback:logback-core 1.2.12 EPL-1.0
628+
ch.qos.logback:logback-core 1.3.14 EPL-1.0
623629

624630
========================================================================
625-
EPL-2.0 and GPL-2.0 licenses
631+
EPL-2.0 licenses
626632
========================================================================
627633

628-
jakarta.annotation:jakarta.annotation-api 1.3.5 EPL-2.0 and GPL-2.0
634+
jakarta.annotation:jakarta.annotation-api 1.3.5 EPL-2.0
629635

630636
========================================================================
631637
ISC licenses
@@ -1013,13 +1019,15 @@ MIT licenses
10131019
wide-align/node_modules/strip-ansi 4.0.0 MIT
10141020
yamljs 0.3.0 MIT
10151021
yargs 16.2.0 MIT
1022+
sha.js 2.4.11 MIT
10161023
yargs-unparser 2.0.0 MIT
10171024
yargs-unparser/node_modules/camelcase 6.3.0 MIT
10181025
yargs-unparser/node_modules/decamelize 4.0.0 MIT
10191026
yargs-unparser/node_modules/is-plain-obj 2.1.0 MIT
10201027
yocto-queue 0.1.0 MIT
10211028
org.slf4j:jul-to-slf4j 1.7.36 MIT
10221029
org.slf4j:slf4j-api 1.7.36 MIT
1030+
redis.clients:jedis 3.8.0 MIT
10231031

10241032
========================================================================
10251033
Public Domain licenses
@@ -1040,97 +1048,25 @@ SIL licenses
10401048
bpmn-font 0.12.1 SIL
10411049

10421050
========================================================================
1043-
http://antlr.org/license.html licenses
1044-
========================================================================
1045-
1046-
org.antlr:stringtemplate 3.2.1 http://antlr.org/license.html
1047-
1048-
========================================================================
1049-
http://github.com/redis/jedis/raw/master/LICENSE.txt licenses
1050-
========================================================================
1051-
1052-
redis.clients:jedis 3.8.0 http://github.com/redis/jedis/raw/master/LICENSE.txt
1053-
1054-
========================================================================
1055-
http://glassfish.java.net/public/CDDL+GPL_1_1.html, http://glassfish.java.net/public/CDDL+GPL_1_1.html licenses
1056-
========================================================================
1057-
1058-
com.sun.jersey.contribs:jersey-apache-client4 1.19.1 http://glassfish.java.net/public/CDDL+GPL_1_1.html, http://glassfish.java.net/public/CDDL+GPL_1_1.html
1059-
com.sun.jersey:jersey-client 1.19.1 http://glassfish.java.net/public/CDDL+GPL_1_1.html, http://glassfish.java.net/public/CDDL+GPL_1_1.html
1060-
com.sun.jersey:jersey-core 1.19.1 http://glassfish.java.net/public/CDDL+GPL_1_1.html, http://glassfish.java.net/public/CDDL+GPL_1_1.html
1061-
1062-
========================================================================
1063-
http://source.icu-project.org/repos/icu/trunk/icu4j/main/shared/licenses/LICENSE licenses
1064-
========================================================================
1065-
1066-
com.ibm.icu:icu4j 61.1 http://source.icu-project.org/repos/icu/trunk/icu4j/main/shared/licenses/LICENSE
1067-
1068-
========================================================================
1069-
http://www.abego-software.de/legal/apl-v10.html licenses
1070-
========================================================================
1071-
1072-
org.abego.treelayout:org.abego.treelayout.core 1.0.3 http://www.abego-software.de/legal/apl-v10.html
1073-
1074-
========================================================================
1075-
http://www.antlr.org/license.html licenses
1076-
========================================================================
1077-
1078-
antlr:antlr 2.7.7 http://www.antlr.org/license.html
1079-
org.antlr:antlr4-runtime 4.8 http://www.antlr.org/license.html
1080-
1081-
========================================================================
1082-
http://www.apache.org/licenses/LICENSE-1.1.txt licenses
1083-
========================================================================
1084-
1085-
com.caucho:hessian 4.0.63 http://www.apache.org/licenses/LICENSE-1.1.txt
1086-
1087-
========================================================================
1088-
http://www.apache.org/licenses/LICENSE-2.0.html and http://www.gnu.org/licenses/gpl-2.0.html licenses
1089-
========================================================================
1090-
1091-
org.rocksdb:rocksdbjni 8.8.1 http://www.apache.org/licenses/LICENSE-2.0.html and http://www.gnu.org/licenses/gpl-2.0.html
1092-
1093-
========================================================================
1094-
http://www.gnu.org/licenses/licenses.html and Apache-2.0 licenses
1051+
Unicode, Inc licenses
10951052
========================================================================
10961053

1097-
net.java.dev.jna:jna 5.5.0 http://www.gnu.org/licenses/licenses.html and Apache-2.0
1054+
com.ibm.icu:icu4j 61.1 Unicode, Inc
10981055

10991056
========================================================================
1100-
http://www.opensource.org/licenses/cddl1.php licenses
1057+
Mozilla Public License Version 2.0
11011058
========================================================================
11021059

1103-
javax.ws.rs:jsr311-api 1.1.1 http://www.opensource.org/licenses/cddl1.php
1060+
com.h2database:h2 2.1.214 MPL-2.0
11041061

11051062
========================================================================
1106-
https://glassfish.java.net/public/CDDL+GPL_1_1.html licenses
1063+
Indiana University Extreme! Lab Software License
11071064
========================================================================
11081065

1109-
org.glassfish:javax.json 1.0.4 https://glassfish.java.net/public/CDDL+GPL_1_1.html
1066+
io.github.x-stream:mxparser 1.2.2 Indiana University Extreme! Lab Software License
11101067

11111068
========================================================================
1112-
https://h2database.com/html/license.html licenses
1113-
========================================================================
1114-
1115-
com.h2database:h2 2.1.214 https://h2database.com/html/license.html
1116-
1117-
========================================================================
1118-
https://opensource.org/licenses/BSD-2-Clause;description=BSD 2-Clause License licenses
1119-
========================================================================
1120-
1121-
com.github.luben:zstd-jni 1.5.0-4 https://opensource.org/licenses/BSD-2-Clause;description=BSD 2-Clause License
1122-
1123-
========================================================================
1124-
https://raw.githubusercontent.com/x-stream/mxparser/master/LICENSE.txt licenses
1125-
========================================================================
1126-
1127-
io.github.x-stream:mxparser 1.2.2 https://raw.githubusercontent.com/x-stream/mxparser/master/LICENSE.txt
1128-
1129-
========================================================================
1130-
https://spdx.org/licenses/BSD-3-Clause.html licenses
1069+
0BSD licenses
11311070
========================================================================
11321071

1133-
org.codehaus.janino:commons-compiler 3.1.10 https://spdx.org/licenses/BSD-3-Clause.html
1134-
org.codehaus.janino:commons-compiler 3.1.9 https://spdx.org/licenses/BSD-3-Clause.html
1135-
org.codehaus.janino:janino 3.1.10 https://spdx.org/licenses/BSD-3-Clause.html
1136-
org.codehaus.janino:janino 3.1.7 https://spdx.org/licenses/BSD-3-Clause.html
1072+
tslib 2.6.2 0BSD

0 commit comments

Comments
 (0)