Skip to content

Commit 8615693

Browse files
committed
Update the listing and counts for 3.21 default.
Signed-off-by: markstur <mark.sturdevant@ibm.com>
1 parent 5464027 commit 8615693

File tree

4 files changed

+40
-10
lines changed

4 files changed

+40
-10
lines changed

cmd/license-scanner.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ license-scanner [flags]
4444
--list List the license templates to be used
4545
-n, --normalized Flag normalized
4646
-q, --quiet Set logging to quiet
47-
--spdx string SPDX templates to use (default "default")
47+
--spdx string Set of embedded SPDX templates to use (default "default")
48+
--spdxPath string Path to external SPDX templates to use
49+
--updateAll Update existing licenses
4850
```
4951

50-
###### Auto generated by spf13/cobra on 1-Mar-2023
52+
###### Auto generated by spf13/cobra on 15-Aug-2023

identifier/identifier_spdx_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func Test_identifyLicensesInSPDXTestDataDirectory(t *testing.T) {
4747
t.Errorf("IdentifyLicensesInDirectory(%v) err = %v", testDataDir, err)
4848
}
4949

50-
const expected = 553
50+
const expected = 581
5151
actual := 0
5252
for _, result := range results {
5353
result := result

licenses/license_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
)
1717

1818
const (
19-
expectedLicenseCount = 553
20-
expectedPrecheckCount = 569
19+
expectedLicenseCount = 581
20+
expectedPrecheckCount = 597
2121
acceptablePatternsCount = 0
2222
)
2323

resources/LIST.md

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
| APSL-1.1 | Apple Public Source License 1.1 | | 1 | Y | |
2525
| APSL-1.2 | Apple Public Source License 1.2 | | 1 | Y | |
2626
| APSL-2.0 | Apple Public Source License 2.0 | | 1 | Y | Y |
27+
| ASWF-Digital-Assets-1.0 | ASWF Digital Assets License version 1.0 | | 1 | | |
28+
| ASWF-Digital-Assets-1.1 | ASWF Digital Assets License 1.1 | | 1 | | |
2729
| Abstyles | Abstyles License | | 1 | | |
2830
| AdaCore-doc | AdaCore Doc License | | 1 | | |
2931
| Adobe-2006 | Adobe Systems Incorporated Source Code License Agreement | | 1 | | |
@@ -73,6 +75,7 @@
7375
| Bitstream-Charter | Bitstream Charter Font License | | 1 | | |
7476
| Bitstream-Vera | Bitstream Vera Font License | | 1 | | |
7577
| BlueOak-1.0.0 | Blue Oak Model License 1.0.0 | | 1 | | |
78+
| Boehm-GC | Boehm-Demers-Weiser GC License | | 1 | | |
7679
| Borceux | Borceux license | | 1 | | |
7780
| Brian-Gladman-3-Clause | Brian Gladman 3-Clause License | | 1 | | |
7881
| C-UDA-1.0 | Computational Use of Data Agreement v1.0 | | 1 | | |
@@ -127,6 +130,7 @@
127130
| CC-BY-SA-3.0 | Creative Commons Attribution Share Alike 3.0 Unported | | 1 | | |
128131
| CC-BY-SA-3.0-AT | Creative Commons Attribution Share Alike 3.0 Austria | | 1 | | |
129132
| CC-BY-SA-3.0-DE | Creative Commons Attribution Share Alike 3.0 Germany | | 1 | | |
133+
| CC-BY-SA-3.0-IGO | Creative Commons Attribution-ShareAlike 3.0 IGO | | 1 | | |
130134
| CC-BY-SA-4.0 | Creative Commons Attribution Share Alike 4.0 International | | 1 | | Y |
131135
| CC-PDDC | Creative Commons Public Domain Dedication and Certification | | 1 | | |
132136
| CC0-1.0 | Creative Commons Zero v1.0 Universal | | 1 | | Y |
@@ -191,7 +195,7 @@
191195
| FSFAP | FSF All Permissive License | | 1 | | Y |
192196
| FSFUL | FSF Unlimited License | | 1 | | |
193197
| FSFULLR | FSF Unlimited License (with License Retention) | | 1 | | |
194-
| FSFULLRWD | FSF Unlimited License (With License Retention and Warranty Disclaimer) | | 1 | | |
198+
| FSFULLRWD | FSF Unlimited License (With License Retention and Warranty Disclaimer) | | 1 | | |
195199
| FTL | Freetype Project License | | 1 | | Y |
196200
| Fair | Fair License | | 1 | Y | |
197201
| Frameworx-1.0 | Frameworx Open License 1.0 | | 1 | Y | |
@@ -248,6 +252,7 @@
248252
| ImageMagick | ImageMagick License | | 1 | | |
249253
| Imlib2 | Imlib2 License | | 1 | | Y |
250254
| Info-ZIP | Info-ZIP License | | 1 | | |
255+
| Inner-Net-2.0 | Inner Net License v2.0 | | 1 | | |
251256
| Intel | Intel Open Source License | | 1 | Y | Y |
252257
| Intel-ACPI | Intel ACPI Software License Agreement | | 1 | | |
253258
| Interbase-1.0 | Interbase Public License v1.0 | | 1 | | |
@@ -278,16 +283,21 @@
278283
| LZMA-SDK-9.11-to-9.20 | LZMA SDK License (versions 9.11 to 9.20) | | 1 | | |
279284
| LZMA-SDK-9.22 | LZMA SDK License (versions 9.22 and beyond) | | 1 | | |
280285
| Latex2e | Latex2e License | | 1 | | |
286+
| Latex2e-translated-notice | Latex2e with translated notice permission | | 1 | | |
281287
| Leptonica | Leptonica License | | 1 | | |
282288
| LiLiQ-P-1.1 | Licence Libre du Québec – Permissive version 1.1 | | 1 | Y | |
283289
| LiLiQ-R-1.1 | Licence Libre du Québec – Réciprocité version 1.1 | | 1 | Y | |
284290
| LiLiQ-Rplus-1.1 | Licence Libre du Québec – Réciprocité forte version 1.1 | | 1 | Y | |
285291
| Libpng | libpng License | | 1 | | |
286292
| Linux-OpenIB | Linux Kernel Variant of OpenIB.org license | | 1 | | |
293+
| Linux-man-pages-1-para | Linux man-pages - 1 paragraph | | 1 | | |
287294
| Linux-man-pages-copyleft | Linux man-pages Copyleft | | 1 | | |
295+
| Linux-man-pages-copyleft-2-para | Linux man-pages Copyleft - 2 paragraphs | | 1 | | |
296+
| Linux-man-pages-copyleft-var | Linux man-pages Copyleft Variant | | 1 | | |
288297
| MIT | MIT License | MIT | 2 | Y | Y |
289298
| MIT-0 | MIT No Attribution | | 1 | Y | |
290299
| MIT-CMU | CMU License | | 1 | | |
300+
| MIT-Festival | MIT Festival Variant | | 1 | | |
291301
| MIT-Modern-Variant | MIT License Modern Variant | | 1 | Y | |
292302
| MIT-Wu | MIT Tom Wu Variant | | 1 | | |
293303
| MIT-advertising | Enlightenment License (e16) | | 1 | | |
@@ -321,6 +331,7 @@
321331
| NICTA-1.0 | NICTA Public Software License, Version 1.0 | | 1 | | |
322332
| NIST-PD | NIST Public Domain Notice | | 1 | | |
323333
| NIST-PD-fallback | NIST Public Domain Notice with license fallback | | 1 | | |
334+
| NIST-Software | NIST Software License | | 1 | | |
324335
| NLOD-1.0 | Norwegian Licence for Open Government Data (NLOD) 1.0 | | 1 | | |
325336
| NLOD-2.0 | Norwegian Licence for Open Government Data (NLOD) 2.0 | | 1 | | |
326337
| NLPL | No Limit Public License | | 1 | | |
@@ -372,8 +383,10 @@
372383
| OLDAP-2.6 | Open LDAP Public License v2.6 | | 1 | | |
373384
| OLDAP-2.7 | Open LDAP Public License v2.7 | | 1 | | Y |
374385
| OLDAP-2.8 | Open LDAP Public License v2.8 | | 1 | Y | |
386+
| OLFL-1.3 | Open Logistics Foundation License Version 1.3 | | 1 | Y | |
375387
| OML | Open Market License | | 1 | | |
376388
| OPL-1.0 | Open Public License v1.0 | | 1 | | |
389+
| OPL-UK-3.0 | United Kingdom Open Parliament Licence v3.0 | | 1 | | |
377390
| OPUBL-1.0 | Open Publication License v1.0 | | 1 | | |
378391
| OSET-PL-2.1 | OSET Public License version 2.1 | | 1 | Y | |
379392
| OSL-1.0 | Open Software License 1.0 | | 1 | Y | Y |
@@ -411,6 +424,7 @@
411424
| SGI-B-1.0 | SGI Free Software License B v1.0 | | 1 | | |
412425
| SGI-B-1.1 | SGI Free Software License B v1.1 | | 1 | | |
413426
| SGI-B-2.0 | SGI Free Software License B v2.0 | | 1 | | Y |
427+
| SGP4 | SGP4 Permission Notice | | 1 | | |
414428
| SHL-0.5 | Solderpad Hardware License v0.5 | | 1 | | |
415429
| SHL-0.51 | Solderpad Hardware License, Version 0.51 | | 1 | | |
416430
| SISSL | Sun Industry Standards Source License v1.1 | | 1 | Y | Y |
@@ -446,12 +460,14 @@
446460
| TTWL | Text-Tabs+Wrap License | | 1 | | |
447461
| TU-Berlin-1.0 | Technische Universitaet Berlin License 1.0 | | 1 | | |
448462
| TU-Berlin-2.0 | Technische Universitaet Berlin License 2.0 | | 1 | | |
463+
| TermReadKey | TermReadKey License | | 1 | | |
449464
| UCAR | UCAR License | | 1 | | |
450465
| UCL-1.0 | Upstream Compatibility License v1.0 | | 1 | Y | |
451466
| UPL-1.0 | Universal Permissive License v1.0 | | 1 | Y | Y |
452467
| Unicode-DFS-2015 | Unicode License Agreement - Data Files and Software (2015) | | 1 | | |
453468
| Unicode-DFS-2016 | Unicode License Agreement - Data Files and Software (2016) | | 1 | Y | |
454469
| Unicode-TOU | Unicode Terms of Use | | 1 | | |
470+
| UnixCrypt | UnixCrypt License | | 1 | | |
455471
| Unlicense | The Unlicense | | 1 | Y | Y |
456472
| VOSTROM | VOSTROM Public License for Open Source | | 1 | | |
457473
| VSL-1.0 | Vovida Software License v1.0 | | 1 | Y | |
@@ -461,12 +477,15 @@
461477
| W3C-20150513 | W3C Software Notice and Document License (2015-05-13) | | 1 | | |
462478
| WTFPL | Do What The F*ck You Want To Public License | | 1 | | Y |
463479
| Watcom-1.0 | Sybase Open Watcom Public License 1.0 | | 1 | Y | |
480+
| Widget-Workshop | Widget Workshop License | | 1 | | |
464481
| Wsuipa | Wsuipa License | | 1 | | |
465482
| X11 | X11 License | | 1 | | Y |
466483
| X11-distribute-modifications-variant | X11 License Distribution Modification Variant | | 1 | | |
467484
| XFree86-1.1 | XFree86 License 1.1 | | 1 | | Y |
468485
| XSkat | XSkat License | | 1 | | |
486+
| Xdebug-1.03 | Xdebug License v 1.03 | | 1 | | |
469487
| Xerox | Xerox License | | 1 | | |
488+
| Xfig | Xfig License | | 1 | | |
470489
| Xnet | X.Net License | | 1 | Y | |
471490
| YPL-1.0 | Yahoo! Public License v1.0 | | 1 | | |
472491
| YPL-1.1 | Yahoo! Public License v1.1 | | 1 | | Y |
@@ -485,6 +504,7 @@
485504
| copyleft-next-0.3.1 | copyleft-next 0.3.1 | | 1 | | |
486505
| curl | curl License | | 1 | | |
487506
| diffmark | diffmark license | | 1 | | |
507+
| dtoa | David M. Gay dtoa License | | 1 | | |
488508
| dvipdfm | dvipdfm License | | 1 | | |
489509
| eGenix | eGenix.com Public License 1.1.0 | | 1 | | |
490510
| etalab-2.0 | Etalab Open License 2.0 | | 1 | | |
@@ -495,6 +515,7 @@
495515
| libselinux-1.0 | libselinux public domain notice | | 1 | | |
496516
| libtiff | libtiff License | | 1 | | |
497517
| libutil-David-Nugent | libutil David Nugent License | | 1 | | |
518+
| metamail | metamail License | | 1 | | |
498519
| mpi-permissive | mpi Permissive License | | 1 | | |
499520
| mpich2 | mpich2 License | | 1 | | |
500521
| mplus | mplus Font License | | 1 | | |
@@ -510,9 +531,11 @@
510531
| ID | Name | Family | Templates |
511532
| :--- | :--- | :--- | ---: |
512533
| 389-exception | 389 Directory Server Exception | | 1 |
534+
| Asterisk-exception | Asterisk exception | | 1 |
513535
| Autoconf-exception-2.0 | Autoconf exception 2.0 | | 1 |
514536
| Autoconf-exception-3.0 | Autoconf exception 3.0 | | 1 |
515537
| Autoconf-exception-generic | Autoconf generic exception | | 1 |
538+
| Autoconf-exception-macro | Autoconf macro exception | | 1 |
516539
| Bison-exception-2.2 | Bison exception 2.2 | | 1 |
517540
| Bootloader-exception | Bootloader Distribution Exception | | 1 |
518541
| CLISP-exception-2.0 | CLISP exception 2.0 | | 1 |
@@ -524,13 +547,15 @@
524547
| GCC-exception-2.0 | GCC Runtime Library exception 2.0 | | 1 |
525548
| GCC-exception-3.1 | GCC Runtime Library exception 3.1 | | 1 |
526549
| GNAT-exception | GNAT exception | | 1 |
550+
| GPL-3.0-interface-exception | GPL-3.0 Interface Exception | | 1 |
527551
| GPL-3.0-linking-exception | GPL-3.0 Linking Exception | | 1 |
528552
| GPL-3.0-linking-source-exception | GPL-3.0 Linking Exception (with Corresponding Source) | | 1 |
529553
| GPL-CC-1.0 | GPL Cooperation Commitment 1.0 | | 1 |
530554
| GStreamer-exception-2005 | GStreamer Exception (2005) | | 1 |
531555
| GStreamer-exception-2008 | GStreamer Exception (2008) | | 1 |
532556
| KiCad-libraries-exception | KiCad Libraries Exception | | 1 |
533557
| LGPL-3.0-linking-exception | LGPL-3.0 Linking Exception | | 1 |
558+
| LLGPL | LLGPL Preamble | | 1 |
534559
| LLVM-exception | LLVM Exception | | 1 |
535560
| LZMA-exception | LZMA exception | | 1 |
536561
| Libtool-exception | Libtool Exception | | 1 |
@@ -549,13 +574,16 @@
549574
| Swift-exception | Swift Exception | | 1 |
550575
| Universal-FOSS-exception-1.0 | Universal FOSS Exception, Version 1.0 | | 1 |
551576
| WxWindows-exception-3.1 | WxWindows Library Exception 3.1 | | 1 |
577+
| cryptsetup-OpenSSL-exception | cryptsetup OpenSSL exception | | 1 |
552578
| eCos-exception-2.0 | eCos exception 2.0 | | 1 |
553579
| freertos-exception-2.0 | FreeRTOS Exception 2.0 | | 1 |
554580
| gnu-javamail-exception | GNU JavaMail exception | | 1 |
555581
| i2p-gpl-java-exception | i2p GPL+Java Exception | | 1 |
582+
| libpri-OpenH323-exception | libpri OpenH323 exception | | 1 |
556583
| mif-exception | Macros and Inline Functions Exception | | 1 |
557584
| openvpn-openssl-exception | OpenVPN OpenSSL Exception | | 1 |
558585
| u-boot-exception-2.0 | U-Boot exception 2.0 | | 1 |
586+
| vsftpd-openssl-exception | vsftpd OpenSSL exception | | 1 |
559587
| x11vnc-openssl-exception | x11vnc OpenSSL Exception | | 1 |
560588
## Deprecated Licenses
561589
| ID | Name | Family | Templates | OSI Approved | FSF Libre |
@@ -564,15 +592,15 @@
564592
| ID | Name | Family | Templates |
565593
| :--- | :--- | :--- | ---: |
566594
## Runtime Configuration
567-
* spdx/default (SPDX license list 3.20)
595+
* spdx/default (SPDX license list 3.21)
568596
* custom/default
569597

570598
## License Library
571599
| Type | Count |
572600
| :--- | ---: |
573-
| Licenses | 505 |
574-
| Exceptions | 48 |
601+
| Licenses | 526 |
602+
| Exceptions | 55 |
575603
| Deprecated Licenses | 0 |
576604
| Deprecated Exceptions | 0 |
577605

578-
###### Generated on 2023-02-28T22:14:24-08:00
606+
###### Generated on 2023-08-15T17:22:40-07:00

0 commit comments

Comments
 (0)