Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion cyclonedx/schema/_res/spdx.SNAPSHOT.schema.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://cyclonedx.org/schema/spdx.schema.json",
"$comment": "v1.0-3.26.0",
"$comment": "v1.0-3.27.0",
"type": "string",
"enum": [
"0BSD",
Expand Down Expand Up @@ -51,6 +51,8 @@
"Artistic-1.0-cl8",
"Artistic-1.0-Perl",
"Artistic-2.0",
"Artistic-dist",
"Aspell-RU",
"ASWF-Digital-Assets-1.0",
"ASWF-Digital-Assets-1.1",
"Baekmuk",
Expand All @@ -76,6 +78,7 @@
"BSD-2-Clause-FreeBSD",
"BSD-2-Clause-NetBSD",
"BSD-2-Clause-Patent",
"BSD-2-Clause-pkgconf-disclaimer",
"BSD-2-Clause-Views",
"BSD-3-Clause",
"BSD-3-Clause-acpica",
Expand Down Expand Up @@ -208,6 +211,7 @@
"CPOL-1.02",
"Cronyx",
"Crossword",
"CryptoSwift",
"CrystalStacker",
"CUA-OPL-1.0",
"Cube",
Expand All @@ -219,6 +223,7 @@
"DL-DE-BY-2.0",
"DL-DE-ZERO-2.0",
"DOC",
"DocBook-DTD",
"DocBook-Schema",
"DocBook-Stylesheet",
"DocBook-XML",
Expand Down Expand Up @@ -257,10 +262,14 @@
"FSFAP-no-warranty-disclaimer",
"FSFUL",
"FSFULLR",
"FSFULLRSD",
"FSFULLRWD",
"FSL-1.1-ALv2",
"FSL-1.1-MIT",
"FTL",
"Furuseth",
"fwlw",
"Game-Programming-Gems",
"GCR-docs",
"GD",
"generic-xts",
Expand Down Expand Up @@ -315,6 +324,7 @@
"gtkbook",
"Gutmann",
"HaskellReport",
"HDF5",
"hdparm",
"HIDAPI",
"Hippocratic-2.1",
Expand Down Expand Up @@ -365,6 +375,7 @@
"ISC-Veillard",
"Jam",
"JasPer-2.0",
"jove",
"JPL-image",
"JPNIC",
"JSON",
Expand All @@ -390,6 +401,7 @@
"LGPL-3.0-or-later",
"LGPLLR",
"Libpng",
"libpng-1.6.35",
"libpng-2.0",
"libselinux-1.0",
"libtiff",
Expand Down Expand Up @@ -420,6 +432,7 @@
"magaz",
"mailprio",
"MakeIndex",
"man2html",
"Martin-Birgmeier",
"McPhee-slideshow",
"metamail",
Expand Down Expand Up @@ -470,6 +483,7 @@
"NetCDF",
"Newsletr",
"NGPL",
"ngrep",
"NICTA-1.0",
"NIST-PD",
"NIST-PD-fallback",
Expand All @@ -484,6 +498,7 @@
"NPL-1.1",
"NPOSL-3.0",
"NRL",
"NTIA-PD",
"NTP",
"NTP-0",
"Nunit",
Expand Down Expand Up @@ -596,6 +611,7 @@
"SMPPL",
"SNIA",
"snprintf",
"SOFA",
"softSurfer",
"Soundex",
"Spencer-86",
Expand All @@ -609,6 +625,7 @@
"SSPL-1.0",
"StandardML-NJ",
"SugarCRM-1.1.3",
"SUL-1.0",
"Sun-PPP",
"Sun-PPP-2000",
"SunPro",
Expand Down Expand Up @@ -643,6 +660,8 @@
"Unicode-TOU",
"UnixCrypt",
"Unlicense",
"Unlicense-libtelnet",
"Unlicense-libwhirlpool",
"UPL-1.0",
"URT-RLE",
"Vim",
Expand Down Expand Up @@ -699,6 +718,7 @@
"Classpath-exception-2.0",
"CLISP-exception-2.0",
"cryptsetup-OpenSSL-exception",
"Digia-Qt-LGPL-exception-1.1",
"DigiRule-FOSS-exception",
"eCos-exception-2.0",
"erlang-otp-linking-exception",
Expand Down Expand Up @@ -741,6 +761,7 @@
"OpenJDK-assembly-exception-1.0",
"openvpn-openssl-exception",
"PCRE2-exception",
"polyparse-exception",
"PS-or-PDF-font-exception-20170817",
"QPL-1.0-INRIA-2004-exception",
"Qt-GPL-exception-1.0",
Expand Down
107 changes: 106 additions & 1 deletion cyclonedx/schema/_res/spdx.SNAPSHOT.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
targetNamespace="http://cyclonedx.org/schema/spdx"
version="1.0-3.26.0">
version="1.0-3.27.0">

<xs:simpleType name="licenseId">
<xs:restriction base="xs:string">
Expand Down Expand Up @@ -242,6 +242,16 @@
<xs:documentation>Artistic License 2.0</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Artistic-dist">
<xs:annotation>
<xs:documentation>Artistic License 1.0 (dist)</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Aspell-RU">
<xs:annotation>
<xs:documentation>Aspell Russian License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="ASWF-Digital-Assets-1.0">
<xs:annotation>
<xs:documentation>ASWF Digital Assets License version 1.0</xs:documentation>
Expand Down Expand Up @@ -367,6 +377,11 @@
<xs:documentation>BSD-2-Clause Plus Patent License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="BSD-2-Clause-pkgconf-disclaimer">
<xs:annotation>
<xs:documentation>BSD 2-Clause pkgconf disclaimer variant</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="BSD-2-Clause-Views">
<xs:annotation>
<xs:documentation>BSD 2-Clause with views sentence</xs:documentation>
Expand Down Expand Up @@ -1027,6 +1042,11 @@
<xs:documentation>Crossword License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="CryptoSwift">
<xs:annotation>
<xs:documentation>CryptoSwift License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="CrystalStacker">
<xs:annotation>
<xs:documentation>CrystalStacker License</xs:documentation>
Expand Down Expand Up @@ -1082,6 +1102,11 @@
<xs:documentation>DOC License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="DocBook-DTD">
<xs:annotation>
<xs:documentation>DocBook DTD License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="DocBook-Schema">
<xs:annotation>
<xs:documentation>DocBook Schema License</xs:documentation>
Expand Down Expand Up @@ -1272,11 +1297,26 @@
<xs:documentation>FSF Unlimited License (with License Retention)</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FSFULLRSD">
<xs:annotation>
<xs:documentation>FSF Unlimited License (with License Retention and Short Disclaimer)</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FSFULLRWD">
<xs:annotation>
<xs:documentation>FSF Unlimited License (With License Retention and Warranty Disclaimer)</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FSL-1.1-ALv2">
<xs:annotation>
<xs:documentation>Functional Source License, Version 1.1, ALv2 Future License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FSL-1.1-MIT">
<xs:annotation>
<xs:documentation>Functional Source License, Version 1.1, MIT Future License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FTL">
<xs:annotation>
<xs:documentation>Freetype Project License</xs:documentation>
Expand All @@ -1292,6 +1332,11 @@
<xs:documentation>fwlw License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Game-Programming-Gems">
<xs:annotation>
<xs:documentation>Game Programming Gems License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="GCR-docs">
<xs:annotation>
<xs:documentation>Gnome GCR Documentation License</xs:documentation>
Expand Down Expand Up @@ -1562,6 +1607,11 @@
<xs:documentation>Haskell Language Report License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="HDF5">
<xs:annotation>
<xs:documentation>HDF5 License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="hdparm">
<xs:annotation>
<xs:documentation>hdparm License</xs:documentation>
Expand Down Expand Up @@ -1812,6 +1862,11 @@
<xs:documentation>JasPer License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="jove">
<xs:annotation>
<xs:documentation>Jove License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="JPL-image">
<xs:annotation>
<xs:documentation>JPL Image Use Policy</xs:documentation>
Expand Down Expand Up @@ -1937,6 +1992,11 @@
<xs:documentation>libpng License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="libpng-1.6.35">
<xs:annotation>
<xs:documentation>PNG Reference Library License v1 (for libpng 0.5 through 1.6.35)</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="libpng-2.0">
<xs:annotation>
<xs:documentation>PNG Reference Library version 2</xs:documentation>
Expand Down Expand Up @@ -2087,6 +2147,11 @@
<xs:documentation>MakeIndex License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="man2html">
<xs:annotation>
<xs:documentation>man2html License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Martin-Birgmeier">
<xs:annotation>
<xs:documentation>Martin Birgmeier License</xs:documentation>
Expand Down Expand Up @@ -2337,6 +2402,11 @@
<xs:documentation>Nethack General Public License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="ngrep">
<xs:annotation>
<xs:documentation>ngrep License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="NICTA-1.0">
<xs:annotation>
<xs:documentation>NICTA Public Software License, Version 1.0</xs:documentation>
Expand Down Expand Up @@ -2407,6 +2477,11 @@
<xs:documentation>NRL License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="NTIA-PD">
<xs:annotation>
<xs:documentation>NTIA Public Domain Notice</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="NTP">
<xs:annotation>
<xs:documentation>NTP License</xs:documentation>
Expand Down Expand Up @@ -2967,6 +3042,11 @@
<xs:documentation>snprintf License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="SOFA">
<xs:annotation>
<xs:documentation>SOFA Software License</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="softSurfer">
<xs:annotation>
<xs:documentation>softSurfer License</xs:documentation>
Expand Down Expand Up @@ -3032,6 +3112,11 @@
<xs:documentation>SugarCRM Public License v1.1.3</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="SUL-1.0">
<xs:annotation>
<xs:documentation>Sustainable Use License v1.0</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Sun-PPP">
<xs:annotation>
<xs:documentation>Sun PPP License</xs:documentation>
Expand Down Expand Up @@ -3202,6 +3287,16 @@
<xs:documentation>The Unlicense</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Unlicense-libtelnet">
<xs:annotation>
<xs:documentation>Unlicense - libtelnet variant</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Unlicense-libwhirlpool">
<xs:annotation>
<xs:documentation>Unlicense - libwhirlpool variant</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="UPL-1.0">
<xs:annotation>
<xs:documentation>Universal Permissive License v1.0</xs:documentation>
Expand Down Expand Up @@ -3483,6 +3578,11 @@
<xs:documentation>cryptsetup OpenSSL exception</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="Digia-Qt-LGPL-exception-1.1">
<xs:annotation>
<xs:documentation>Digia Qt LGPL Exception version 1.1</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="DigiRule-FOSS-exception">
<xs:annotation>
<xs:documentation>DigiRule FOSS License Exception</xs:documentation>
Expand Down Expand Up @@ -3693,6 +3793,11 @@
<xs:documentation>PCRE2 exception</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="polyparse-exception">
<xs:annotation>
<xs:documentation>Polyparse Exception</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="PS-or-PDF-font-exception-20170817">
<xs:annotation>
<xs:documentation>PS/PDF font exception (2017-08-17)</xs:documentation>
Expand Down
Loading