From 208e458a43a2475de98e383dbd27b45923bccea1 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Thu, 5 Jun 2025 18:02:21 +0200 Subject: [PATCH] Pulled SPDX license IDs v1.0-3.26.0 Signed-off-by: Jan Kowalleck --- HISTORY.md | 7 ++ res/schema/spdx.SNAPSHOT.schema.json | 30 +++++- res/schema/spdx.SNAPSHOT.xsd | 144 ++++++++++++++++++++++++++- tools/schema-downloader/download.js | 7 +- 4 files changed, 182 insertions(+), 6 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index dea0c69ff..1a7d6b7c7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -8,6 +8,13 @@ All notable changes to this project will be documented in this file. ## 8.2.0 -- 2025-06-05 +* Added + * Pulled SPDX license IDs v1.0-3.26.0 (via [#]) + +[#]: + +## 8.2.0 -- 2025-06-05 + * Added * `factories.FromNodePackageJson.makeExternalReferences()` supports "dist" field ([#1247] via [#1246]) * New symbols under `utils.NpmjsUtility` (via [#1246]) diff --git a/res/schema/spdx.SNAPSHOT.schema.json b/res/schema/spdx.SNAPSHOT.schema.json index 3406c45c0..552c631f2 100644 --- a/res/schema/spdx.SNAPSHOT.schema.json +++ b/res/schema/spdx.SNAPSHOT.schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "$id": "http://cyclonedx.org/schema/spdx.schema.json", - "$comment": "v1.0-3.24.0", + "$comment": "v1.0-3.26.0", "type": "string", "enum": [ "0BSD", @@ -35,6 +35,7 @@ "ANTLR-PD", "ANTLR-PD-fallback", "any-OSI", + "any-OSI-perl-modules", "Apache-1.0", "Apache-1.1", "Apache-2.0", @@ -64,6 +65,7 @@ "blessing", "BlueOak-1.0.0", "Boehm-GC", + "Boehm-GC-without-fee", "Borceux", "Brian-Gladman-2-Clause", "Brian-Gladman-3-Clause", @@ -165,6 +167,8 @@ "CC-BY-SA-3.0-IGO", "CC-BY-SA-4.0", "CC-PDDC", + "CC-PDM-1.0", + "CC-SA-1.0", "CC0-1.0", "CDDL-1.0", "CDDL-1.1", @@ -215,6 +219,9 @@ "DL-DE-BY-2.0", "DL-DE-ZERO-2.0", "DOC", + "DocBook-Schema", + "DocBook-Stylesheet", + "DocBook-XML", "Dotseqn", "DRL-1.0", "DRL-1.1", @@ -256,6 +263,7 @@ "fwlw", "GCR-docs", "GD", + "generic-xts", "GFDL-1.1", "GFDL-1.1-invariants-only", "GFDL-1.1-invariants-or-later", @@ -308,6 +316,7 @@ "Gutmann", "HaskellReport", "hdparm", + "HIDAPI", "Hippocratic-2.1", "HP-1986", "HP-1989", @@ -326,6 +335,7 @@ "HPND-Markus-Kuhn", "HPND-merchantability-variant", "HPND-MIT-disclaimer", + "HPND-Netrek", "HPND-Pbmplus", "HPND-sell-MIT-disclaimer-xserver", "HPND-sell-regexpr", @@ -345,6 +355,7 @@ "Imlib2", "Info-ZIP", "Inner-Net-2.0", + "InnoSetup", "Intel", "Intel-ACPI", "Interbase-1.0", @@ -413,10 +424,12 @@ "McPhee-slideshow", "metamail", "Minpack", + "MIPS", "MirOS", "MIT", "MIT-0", "MIT-advertising", + "MIT-Click", "MIT-CMU", "MIT-enna", "MIT-feh", @@ -557,6 +570,7 @@ "RSA-MD", "RSCPL", "Ruby", + "Ruby-pty", "SAX-PD", "SAX-PD-2.0", "Saxpath", @@ -564,6 +578,7 @@ "SchemeReport", "Sendmail", "Sendmail-8.23", + "Sendmail-Open-Source-1.1", "SGI-B-1.0", "SGI-B-1.1", "SGI-B-2.0", @@ -576,6 +591,7 @@ "SISSL-1.2", "SL", "Sleepycat", + "SMAIL-GPL", "SMLNJ", "SMPPL", "SNIA", @@ -604,16 +620,19 @@ "TCP-wrappers", "TermReadKey", "TGPPL-1.0", + "ThirdEye", "threeparttable", "TMate", "TORQUE-1.1", "TOSL", "TPDL", "TPL-1.0", + "TrustedQSL", "TTWL", "TTYP0", "TU-Berlin-1.0", "TU-Berlin-2.0", + "Ubuntu-font-1.0", "UCAR", "UCL-1.0", "ulem", @@ -637,9 +656,11 @@ "Widget-Workshop", "Wsuipa", "WTFPL", + "wwl", "wxWindows", "X11", "X11-distribute-modifications-variant", + "X11-swapped", "Xdebug-1.03", "Xerox", "Xfig", @@ -674,11 +695,13 @@ "Bison-exception-1.24", "Bison-exception-2.2", "Bootloader-exception", + "CGAL-linking-exception", "Classpath-exception-2.0", "CLISP-exception-2.0", "cryptsetup-OpenSSL-exception", "DigiRule-FOSS-exception", "eCos-exception-2.0", + "erlang-otp-linking-exception", "Fawkes-Runtime-exception", "FLTK-exception", "fmt-exception", @@ -692,13 +715,16 @@ "GNOME-examples-exception", "GNU-compiler-exception", "gnu-javamail-exception", + "GPL-3.0-389-ds-base-exception", "GPL-3.0-interface-exception", "GPL-3.0-linking-exception", "GPL-3.0-linking-source-exception", "GPL-CC-1.0", "GStreamer-exception-2005", "GStreamer-exception-2008", + "harbour-exception", "i2p-gpl-java-exception", + "Independent-modules-exception", "KiCad-libraries-exception", "LGPL-3.0-linking-exception", "libpri-OpenH323-exception", @@ -708,6 +734,7 @@ "LLVM-exception", "LZMA-exception", "mif-exception", + "mxml-exception", "Nokia-Qt-exception-1.1", "OCaml-LGPL-linking-exception", "OCCT-exception-1.0", @@ -719,6 +746,7 @@ "Qt-GPL-exception-1.0", "Qt-LGPL-exception-1.1", "Qwt-exception-1.0", + "romic-exception", "RRDtool-FLOSS-exception-2.0", "SANE-exception", "SHL-2.0", diff --git a/res/schema/spdx.SNAPSHOT.xsd b/res/schema/spdx.SNAPSHOT.xsd index a339a0857..6e90a9e43 100644 --- a/res/schema/spdx.SNAPSHOT.xsd +++ b/res/schema/spdx.SNAPSHOT.xsd @@ -2,7 +2,7 @@ + version="1.0-3.26.0"> @@ -162,6 +162,11 @@ Any OSI License + + + Any OSI License - Perl Modules + + Apache License 1.0 @@ -307,6 +312,11 @@ Boehm-Demers-Weiser GC License + + + Boehm-Demers-Weiser GC License (without fee) + + Borceux license @@ -812,6 +822,16 @@ Creative Commons Public Domain Dedication and Certification + + + Creative Commons Public Domain Mark 1.0 Universal + + + + + Creative Commons Share Alike 1.0 Generic + + Creative Commons Zero v1.0 Universal @@ -1062,6 +1082,21 @@ DOC License + + + DocBook Schema License + + + + + DocBook Stylesheet License + + + + + DocBook XML License + + Dotseqn License @@ -1267,6 +1302,11 @@ GD License + + + Generic XTS License + + GNU Free Documentation License v1.1 @@ -1527,6 +1567,11 @@ hdparm License + + + HIDAPI License + + Hippocratic License 2.1 @@ -1617,6 +1662,11 @@ Historical Permission Notice and Disclaimer with MIT disclaimer + + + Historical Permission Notice and Disclaimer - Netrek variant + + Historical Permission Notice and Disclaimer - Pbmplus variant @@ -1712,6 +1762,11 @@ Inner Net License v2.0 + + + Inno Setup License + + Intel Open Source License @@ -2052,6 +2107,11 @@ Minpack License + + + MIPS License + + The MirOS Licence @@ -2072,6 +2132,11 @@ Enlightenment License (e16) + + + MIT Click License + + CMU License @@ -2772,6 +2837,11 @@ Ruby License + + + Ruby pty extension license + + Sax Public Domain Notice @@ -2807,6 +2877,11 @@ Sendmail License 8.23 + + + Sendmail Open Source License v1.1 + + SGI Free Software License B v1.0 @@ -2867,6 +2942,11 @@ Sleepycat License + + + SMAIL General Public License + + Standard ML of New Jersey License @@ -3007,6 +3087,11 @@ Transitive Grace Period Public Licence 1.0 + + + ThirdEye License + + threeparttable License @@ -3037,6 +3122,11 @@ THOR Public License 1.0 + + + TrustedQSL License + + Text-Tabs+Wrap License @@ -3057,6 +3147,11 @@ Technische Universitaet Berlin License 2.0 + + + Ubuntu Font Licence v1.0 + + UCAR License @@ -3172,6 +3267,11 @@ Do What The F*ck You Want To Public License + + + WWL License + + wxWindows Library License @@ -3187,6 +3287,11 @@ X11 License Distribution Modification Variant + + + X11 swapped final paragraphs + + Xdebug License v 1.03 @@ -3358,6 +3463,11 @@ Bootloader Distribution Exception + + + CGAL Linking Exception + + Classpath exception 2.0 @@ -3383,6 +3493,11 @@ eCos exception 2.0 + + + Erlang/OTP Linking Exception + + Fawkes Runtime Exception @@ -3425,7 +3540,7 @@ - Gmsh exception> + Gmsh exception @@ -3448,6 +3563,11 @@ GNU JavaMail exception + + + GPL-3.0 389 DS Base Exception + + GPL-3.0 Interface Exception @@ -3478,11 +3598,21 @@ GStreamer Exception (2008) + + + harbour exception + + i2p GPL+Java Exception + + + Independent Module Linking exception + + KiCad Libraries Exception @@ -3528,6 +3658,11 @@ Macros and Inline Functions Exception + + + mxml Exception + + Nokia Qt LGPL exception 1.1 @@ -3583,6 +3718,11 @@ Qwt exception 1.0 + + + Romic Exception + + RRDtool FLOSS exception 2.0 diff --git a/tools/schema-downloader/download.js b/tools/schema-downloader/download.js index de303708b..22125c3eb 100644 --- a/tools/schema-downloader/download.js +++ b/tools/schema-downloader/download.js @@ -22,6 +22,7 @@ import { dirname, join } from 'node:path' import { fileURLToPath } from 'node:url' const SOURCE_ROOT = 'https://raw.githubusercontent.com/CycloneDX/specification/refs/tags/1.6.1/schema/' +const SOURCE_ROOT_LATEST = 'https://raw.githubusercontent.com/CycloneDX/specification/refs/heads/master/schema/' const TARGET_ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'res', 'schema') const BomXsd = Object.freeze({ @@ -77,9 +78,9 @@ const BomJsonStrict = Object.freeze({ }) const OtherDownloadables = Object.freeze(Object.fromEntries([ - [`${SOURCE_ROOT}spdx.schema.json`, join(TARGET_ROOT, 'spdx.SNAPSHOT.schema.json')], - [`${SOURCE_ROOT}spdx.xsd`, join(TARGET_ROOT, 'spdx.SNAPSHOT.xsd')], - [`${SOURCE_ROOT}jsf-0.82.schema.json`, join(TARGET_ROOT, 'jsf-0.82.SNAPSHOT.schema.json')] + [`${SOURCE_ROOT_LATEST}spdx.schema.json`, join(TARGET_ROOT, 'spdx.SNAPSHOT.schema.json')], + [`${SOURCE_ROOT_LATEST}spdx.xsd`, join(TARGET_ROOT, 'spdx.SNAPSHOT.xsd')], + [`${SOURCE_ROOT_LATEST}jsf-0.82.schema.json`, join(TARGET_ROOT, 'jsf-0.82.SNAPSHOT.schema.json')] ])) const FetchOptions = Object.freeze({ mode: 'no-cors' })