diff --git a/cyclonedx/schema/_res/README.md b/cyclonedx/schema/_res/README.md index 83fc1dd9..6bee8e69 100644 --- a/cyclonedx/schema/_res/README.md +++ b/cyclonedx/schema/_res/README.md @@ -4,7 +4,7 @@ some schema for offline use as downloaded via [script](../../../tools/schema-dow original sources: Currently using version -[b29bae660048e0ad2fbc5f2972927b442ce951c4](https://github.com/CycloneDX/specification/commit/b29bae660048e0ad2fbc5f2972927b442ce951c4) +[https://github.com/CycloneDX/specification/commit/349314a9d7671d7d2ca5b711a725f49a73979da6](https://github.com/CycloneDX/specification/commit/https://github.com/CycloneDX/specification/commit/349314a9d7671d7d2ca5b711a725f49a73979da6) | file | note | |------|------| diff --git a/cyclonedx/schema/_res/bom-1.7.SNAPSHOT.xsd b/cyclonedx/schema/_res/bom-1.7.SNAPSHOT.xsd index 7318f6ef..f0cd7ed3 100644 --- a/cyclonedx/schema/_res/bom-1.7.SNAPSHOT.xsd +++ b/cyclonedx/schema/_res/bom-1.7.SNAPSHOT.xsd @@ -22,7 +22,7 @@ limitations under the License. targetNamespace="http://cyclonedx.org/schema/bom/1.7" vc:minVersion="1.0" vc:maxVersion="1.1" - version="1.7.1"> + version="1.7.2"> @@ -8295,8 +8295,48 @@ limitations under the License. - A protocol-related cryptographic assets + + DEPRECATED - DO NOT USE. This will be removed in a future version. Use `./relatedCryptographicAssets` instead. + A protocol-related cryptographic asset. + + + + + + + A list of cryptographic assets related to this component. + + + + + + + A cryptographic asset related to this component. + + + + + + + + Specifies the mechanism by which the cryptographic asset is secured by. + Examples: "publicKey", "privateKey", "algorithm" + + + + + + + The bom-ref to cryptographic asset. + + + + + + + + diff --git a/cyclonedx/schema/_res/spdx.SNAPSHOT.schema.json b/cyclonedx/schema/_res/spdx.SNAPSHOT.schema.json index 2dccc87e..566c4a32 100644 --- a/cyclonedx/schema/_res/spdx.SNAPSHOT.schema.json +++ b/cyclonedx/schema/_res/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.1-3.28.0", + "$comment": "v1.1-3.29.0", "type": "string", "enum": [ "0BSD", @@ -57,6 +57,7 @@ "Aspell-RU", "ASWF-Digital-Assets-1.0", "ASWF-Digital-Assets-1.1", + "atc-game", "Baekmuk", "Bahyph", "Barr", @@ -74,6 +75,7 @@ "Borceux", "Brian-Gladman-2-Clause", "Brian-Gladman-3-Clause", + "Brian-Gladman-3-Clause-no-conversion", "BSD-1-Clause", "BSD-2-Clause", "BSD-2-Clause-Darwin", @@ -82,6 +84,7 @@ "BSD-2-Clause-NetBSD", "BSD-2-Clause-Patent", "BSD-2-Clause-pkgconf-disclaimer", + "BSD-2-Clause-pos-unchanged", "BSD-2-Clause-Views", "BSD-3-Clause", "BSD-3-Clause-acpica", @@ -96,6 +99,7 @@ "BSD-3-Clause-No-Nuclear-License-2014", "BSD-3-Clause-No-Nuclear-Warranty", "BSD-3-Clause-Open-MPI", + "BSD-3-Clause-OpenWebUI", "BSD-3-Clause-Sun", "BSD-3-Clause-Tso", "BSD-4-Clause", @@ -104,16 +108,20 @@ "BSD-4.3RENO", "BSD-4.3TAHOE", "BSD-Advertising-Acknowledgement", + "BSD-ask-to-endorse", "BSD-Attribution-HPND-disclaimer", "BSD-Inferno-Nettverk", "BSD-Mark-Modifications", "BSD-Protection", + "BSD-Source-alt-GPL", "BSD-Source-beginning-file", "BSD-Source-Code", + "BSD-Source-Code-no-disclaimer", "BSD-Systemics", "BSD-Systemics-W3Works", "BSL-1.0", "Buddy", + "Bugroff", "BUSL-1.1", "bzip2-1.0.5", "bzip2-1.0.6", @@ -142,6 +150,7 @@ "CC-BY-NC-2.5", "CC-BY-NC-3.0", "CC-BY-NC-3.0-DE", + "CC-BY-NC-3.0-IGO", "CC-BY-NC-4.0", "CC-BY-NC-ND-1.0", "CC-BY-NC-ND-2.0", @@ -264,6 +273,7 @@ "Fair", "FBM", "FDK-AAC", + "FDK-MPEG-H", "Ferguson-Twofish", "Frameworx-1.0", "FreeBSD-DOC", @@ -338,6 +348,7 @@ "hdparm", "HIDAPI", "Hippocratic-2.1", + "Hippocratic-3.0-core", "HP-1986", "HP-1989", "HPND", @@ -377,6 +388,7 @@ "iMatix", "Imlib2", "Info-ZIP", + "Informatica", "Inner-Net-2.0", "InnoSetup", "Intel", @@ -487,6 +499,7 @@ "MulanPSL-2.0", "Multics", "Mup", + "MVT-1.1", "NAIST-2003", "NASA-1.3", "Naumen", @@ -764,6 +777,7 @@ "GNOME-examples-exception", "GNU-compiler-exception", "gnu-javamail-exception", + "Google-Patent-WebM", "GPL-3.0-389-ds-base-exception", "GPL-3.0-interface-exception", "GPL-3.0-linking-exception", @@ -804,6 +818,7 @@ "SHL-2.0", "SHL-2.1", "Simple-Library-Usage-exception", + "Spelling-Provider-LGPL-exception", "sqlitestudio-OpenSSL-exception", "stunnel-exception", "SWI-exception", @@ -870,6 +885,7 @@ "Aspell-RU": "Aspell Russian License", "ASWF-Digital-Assets-1.0": "ASWF Digital Assets License version 1.0", "ASWF-Digital-Assets-1.1": "ASWF Digital Assets License 1.1", + "atc-game": "atc Game License", "Baekmuk": "Baekmuk License", "Bahyph": "Bahyph License", "Barr": "Barr License", @@ -887,6 +903,7 @@ "Borceux": "Borceux license", "Brian-Gladman-2-Clause": "Brian Gladman 2-Clause License", "Brian-Gladman-3-Clause": "Brian Gladman 3-Clause License", + "Brian-Gladman-3-Clause-no-conversion": "Brian Gladman 3-Clause License (no conversion clause)", "BSD-1-Clause": "BSD 1-Clause License", "BSD-2-Clause": "BSD 2-Clause \"Simplified\" License", "BSD-2-Clause-Darwin": "BSD 2-Clause - Ian Darwin variant", @@ -895,6 +912,7 @@ "BSD-2-Clause-NetBSD": "BSD 2-Clause NetBSD License", "BSD-2-Clause-Patent": "BSD-2-Clause Plus Patent License", "BSD-2-Clause-pkgconf-disclaimer": "BSD 2-Clause pkgconf disclaimer variant", + "BSD-2-Clause-pos-unchanged": "BSD 2-Clause - position unchanged variant", "BSD-2-Clause-Views": "BSD 2-Clause with views sentence", "BSD-3-Clause": "BSD 3-Clause \"New\" or \"Revised\" License", "BSD-3-Clause-acpica": "BSD 3-Clause acpica variant", @@ -909,6 +927,7 @@ "BSD-3-Clause-No-Nuclear-License-2014": "BSD 3-Clause No Nuclear License 2014", "BSD-3-Clause-No-Nuclear-Warranty": "BSD 3-Clause No Nuclear Warranty", "BSD-3-Clause-Open-MPI": "BSD 3-Clause Open MPI variant", + "BSD-3-Clause-OpenWebUI": "BSD 3-Clause - OpenWebUI variant", "BSD-3-Clause-Sun": "BSD 3-Clause Sun Microsystems", "BSD-3-Clause-Tso": "BSD 3-Clause Tso variant", "BSD-4-Clause": "BSD 4-Clause \"Original\" or \"Old\" License", @@ -917,16 +936,20 @@ "BSD-4.3RENO": "BSD 4.3 RENO License", "BSD-4.3TAHOE": "BSD 4.3 TAHOE License", "BSD-Advertising-Acknowledgement": "BSD Advertising Acknowledgement License", + "BSD-ask-to-endorse": "BSD - ask to endorse", "BSD-Attribution-HPND-disclaimer": "BSD with Attribution and HPND disclaimer", "BSD-Inferno-Nettverk": "BSD-Inferno-Nettverk", "BSD-Mark-Modifications": "BSD Mark Modifications License", "BSD-Protection": "BSD Protection License", + "BSD-Source-alt-GPL": "BSD Source Code Attribution - GPL alternative", "BSD-Source-beginning-file": "BSD Source Code Attribution - beginning of file variant", "BSD-Source-Code": "BSD Source Code Attribution", + "BSD-Source-Code-no-disclaimer": "BSD Source Code Attribution - no disclaimer", "BSD-Systemics": "Systemics BSD variant license", "BSD-Systemics-W3Works": "Systemics W3Works BSD variant license", "BSL-1.0": "Boost Software License 1.0", "Buddy": "Buddy License", + "Bugroff": "Bugroff License", "BUSL-1.1": "Business Source License 1.1", "bzip2-1.0.5": "bzip2 and libbzip2 License v1.0.5", "bzip2-1.0.6": "bzip2 and libbzip2 License v1.0.6", @@ -955,6 +978,7 @@ "CC-BY-NC-2.5": "Creative Commons Attribution Non Commercial 2.5 Generic", "CC-BY-NC-3.0": "Creative Commons Attribution Non Commercial 3.0 Unported", "CC-BY-NC-3.0-DE": "Creative Commons Attribution Non Commercial 3.0 Germany", + "CC-BY-NC-3.0-IGO": "Creative Commons Attribution Non Commercial 3.0 IGO", "CC-BY-NC-4.0": "Creative Commons Attribution Non Commercial 4.0 International", "CC-BY-NC-ND-1.0": "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic", "CC-BY-NC-ND-2.0": "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic", @@ -1077,6 +1101,7 @@ "Fair": "Fair License", "FBM": "Fuzzy Bitmap License", "FDK-AAC": "Fraunhofer FDK AAC Codec Library", + "FDK-MPEG-H": "Fraunhofer FDK MPEG-H Software", "Ferguson-Twofish": "Ferguson Twofish License", "Frameworx-1.0": "Frameworx Open License 1.0", "FreeBSD-DOC": "FreeBSD Documentation License", @@ -1151,6 +1176,7 @@ "hdparm": "hdparm License", "HIDAPI": "HIDAPI License", "Hippocratic-2.1": "Hippocratic License 2.1", + "Hippocratic-3.0-core": "Hippocratic License 3.0", "HP-1986": "Hewlett-Packard 1986 License", "HP-1989": "Hewlett-Packard 1989 License", "HPND": "Historical Permission Notice and Disclaimer", @@ -1190,6 +1216,7 @@ "iMatix": "iMatix Standard Function Library Agreement", "Imlib2": "Imlib2 License", "Info-ZIP": "Info-ZIP License", + "Informatica": "Informatica License", "Inner-Net-2.0": "Inner Net License v2.0", "InnoSetup": "Inno Setup License", "Intel": "Intel Open Source License", @@ -1300,6 +1327,7 @@ "MulanPSL-2.0": "Mulan Permissive Software License, Version 2", "Multics": "Multics License", "Mup": "Mup License", + "MVT-1.1": "MVT License 1.1", "NAIST-2003": "Nara Institute of Science and Technology License (2003)", "NASA-1.3": "NASA Open Source Agreement 1.3", "Naumen": "Naumen Public License", @@ -1577,6 +1605,7 @@ "GNOME-examples-exception": "GNOME examples exception", "GNU-compiler-exception": "GNU Compiler Exception", "gnu-javamail-exception": "GNU JavaMail exception", + "Google-Patent-WebM": "Google Additional IP Rights Grant (Patents) - WebM", "GPL-3.0-389-ds-base-exception": "GPL-3.0 389 DS Base Exception", "GPL-3.0-interface-exception": "GPL-3.0 Interface Exception", "GPL-3.0-linking-exception": "GPL-3.0 Linking Exception", @@ -1617,6 +1646,7 @@ "SHL-2.0": "Solderpad Hardware License v2.0", "SHL-2.1": "Solderpad Hardware License v2.1", "Simple-Library-Usage-exception": "Simple Library Usage Exception", + "Spelling-Provider-LGPL-exception": "Spelling Provider LGPL exception", "sqlitestudio-OpenSSL-exception": "sqlitestudio OpenSSL exception", "stunnel-exception": "stunnel Exception", "SWI-exception": "SWI exception", diff --git a/cyclonedx/schema/_res/spdx.SNAPSHOT.xsd b/cyclonedx/schema/_res/spdx.SNAPSHOT.xsd index e94c265b..4a209304 100644 --- a/cyclonedx/schema/_res/spdx.SNAPSHOT.xsd +++ b/cyclonedx/schema/_res/spdx.SNAPSHOT.xsd @@ -2,7 +2,7 @@ + version="1.0-3.29.0"> @@ -272,6 +272,11 @@ ASWF Digital Assets License 1.1 + + + atc Game License + + Baekmuk License @@ -357,6 +362,11 @@ Brian Gladman 3-Clause License + + + Brian Gladman 3-Clause License (no conversion clause) + + BSD 1-Clause License @@ -397,6 +407,11 @@ BSD 2-Clause pkgconf disclaimer variant + + + BSD 2-Clause - position unchanged variant + + BSD 2-Clause with views sentence @@ -467,6 +482,11 @@ BSD 3-Clause Open MPI variant + + + BSD 3-Clause - OpenWebUI variant + + BSD 3-Clause Sun Microsystems @@ -507,6 +527,11 @@ BSD Advertising Acknowledgement License + + + BSD - ask to endorse + + BSD with Attribution and HPND disclaimer @@ -527,6 +552,11 @@ BSD Protection License + + + BSD Source Code Attribution - GPL alternative + + BSD Source Code Attribution - beginning of file variant @@ -537,6 +567,11 @@ BSD Source Code Attribution + + + BSD Source Code Attribution - no disclaimer + + Systemics BSD variant license @@ -557,6 +592,11 @@ Buddy License + + + Bugroff License + + Business Source License 1.1 @@ -697,6 +737,11 @@ Creative Commons Attribution Non Commercial 3.0 Germany + + + Creative Commons Attribution Non Commercial 3.0 IGO + + Creative Commons Attribution Non Commercial 4.0 International @@ -1307,6 +1352,11 @@ Fraunhofer FDK AAC Codec Library + + + Fraunhofer FDK MPEG-H Software + + Ferguson Twofish License @@ -1677,6 +1727,11 @@ Hippocratic License 2.1 + + + Hippocratic License 3.0 + + Hewlett-Packard 1986 License @@ -1872,6 +1927,11 @@ Info-ZIP License + + + Informatica License + + Inner Net License v2.0 @@ -2422,6 +2482,11 @@ Mup License + + + MVT License 1.1 + + Nara Institute of Science and Technology License (2003) @@ -3808,6 +3873,11 @@ GNU JavaMail exception + + + Google Additional IP Rights Grant (Patents) - WebM + + GPL-3.0 389 DS Base Exception @@ -4008,6 +4078,11 @@ Simple Library Usage Exception + + + Spelling Provider LGPL exception + + sqlitestudio OpenSSL exception diff --git a/tools/schema-downloader.py b/tools/schema-downloader.py index b852a1eb..4385fe94 100755 --- a/tools/schema-downloader.py +++ b/tools/schema-downloader.py @@ -21,7 +21,7 @@ from os.path import dirname, join, realpath from urllib.request import urlretrieve -SOURCE_ROOT = 'https://raw.githubusercontent.com/CycloneDX/specification/refs/tags/1.7.1/schema/' +SOURCE_ROOT = 'https://raw.githubusercontent.com/CycloneDX/specification/refs/tags/1.7.2/schema/' SOURCE_ROOT_LATEST = 'https://raw.githubusercontent.com/CycloneDX/specification/refs/heads/master/schema/' TARGET_ROOT = realpath(join(dirname(__file__), '..', 'cyclonedx', 'schema', '_res'))