Skip to content

Commit 95ab6d2

Browse files
stevespringettstevespringett
committed
Updated SPDX license list to v3.9
1 parent 0380208 commit 95ab6d2

3 files changed

Lines changed: 99 additions & 3 deletions

File tree

‎schema/spdx.schema.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"$id": "http://cyclonedx.org/schema/spdx.schema.json",
4-
"$comment": "v1.0-3.8",
4+
"$comment": "v1.0-3.9",
55
"type": "string",
66
"enum": [
77
"0BSD",
@@ -65,6 +65,8 @@
6565
"BitTorrent-1.1",
6666
"BlueOak-1.0.0",
6767
"Borceux",
68+
"CAL-1.0",
69+
"CAL-1.0-Combined-Work-Exception",
6870
"CATOSL-1.1",
6971
"CC-BY-1.0",
7072
"CC-BY-2.0",
@@ -110,6 +112,9 @@
110112
"CECILL-C",
111113
"CERN-OHL-1.1",
112114
"CERN-OHL-1.2",
115+
"CERN-OHL-P-2.0",
116+
"CERN-OHL-S-2.0",
117+
"CERN-OHL-W-2.0",
113118
"CNRI-Jython",
114119
"CNRI-Python",
115120
"CNRI-Python-GPL-Compatible",
@@ -182,6 +187,7 @@
182187
"HPND",
183188
"HPND-sell-variant",
184189
"HaskellReport",
190+
"Hippocratic-2.1",
185191
"IBM-pibs",
186192
"ICU",
187193
"IJG",
@@ -244,10 +250,12 @@
244250
"MirOS",
245251
"Motosoto",
246252
"MulanPSL-1.0",
253+
"MulanPSL-2.0",
247254
"Multics",
248255
"Mup",
249256
"NASA-1.3",
250257
"NBPL-1.0",
258+
"NCGL-UK-2.0",
251259
"NCSA",
252260
"NGPL",
253261
"NLOD-1.0",
@@ -266,6 +274,7 @@
266274
"Nokia",
267275
"Noweb",
268276
"Nunit",
277+
"O-UDA-1.0",
269278
"OCCT-PL",
270279
"OCLC-2.0",
271280
"ODC-By-1.0",
@@ -276,6 +285,7 @@
276285
"OFL-1.1",
277286
"OFL-1.1-RFN",
278287
"OFL-1.1-no-RFN",
288+
"OGC-1.0",
279289
"OGL-Canada-2.0",
280290
"OGL-UK-1.0",
281291
"OGL-UK-2.0",
@@ -311,7 +321,10 @@
311321
"PHP-3.01",
312322
"PSF-2.0",
313323
"Parity-6.0.0",
324+
"Parity-7.0.0",
314325
"Plexus",
326+
"PolyForm-Noncommercial-1.0.0",
327+
"PolyForm-Small-Business-1.0.0",
315328
"PostgreSQL",
316329
"Python-2.0",
317330
"QPL-1.0",
@@ -421,6 +434,7 @@
421434
"u-boot-exception-2.0",
422435
"PS-or-PDF-font-exception-20170817",
423436
"gnu-javamail-exception",
437+
"LGPL-3.0-linking-exception",
424438
"DigiRule-FOSS-exception",
425439
"LLVM-exception",
426440
"Linux-syscall-note",
@@ -438,6 +452,7 @@
438452
"OCaml-LGPL-linking-exception",
439453
"GCC-exception-3.1",
440454
"Bootloader-exception",
455+
"SHL-2.0",
441456
"Classpath-exception-2.0",
442457
"Swift-exception",
443458
"Autoconf-exception-2.0",
@@ -450,6 +465,7 @@
450465
"i2p-gpl-java-exception",
451466
"GPL-CC-1.0",
452467
"Qt-LGPL-exception-1.1",
468+
"SHL-2.1",
453469
"Qt-GPL-exception-1.0"
454470
]
455471
}

‎schema/spdx.xsd‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
33
elementFormDefault="qualified"
44
targetNamespace="http://cyclonedx.org/schema/spdx"
5-
version="1.0-3.8">
5+
version="1.0-3.9">
66

77
<xs:simpleType name="licenseId">
88
<xs:restriction base="xs:string">
@@ -312,6 +312,16 @@
312312
<xs:documentation>Borceux license</xs:documentation>
313313
</xs:annotation>
314314
</xs:enumeration>
315+
<xs:enumeration value="CAL-1.0">
316+
<xs:annotation>
317+
<xs:documentation>Cryptographic Autonomy License 1.0</xs:documentation>
318+
</xs:annotation>
319+
</xs:enumeration>
320+
<xs:enumeration value="CAL-1.0-Combined-Work-Exception">
321+
<xs:annotation>
322+
<xs:documentation>Cryptographic Autonomy License 1.0 (Combined Work Exception)</xs:documentation>
323+
</xs:annotation>
324+
</xs:enumeration>
315325
<xs:enumeration value="CATOSL-1.1">
316326
<xs:annotation>
317327
<xs:documentation>Computer Associates Trusted Open Source License 1.1</xs:documentation>
@@ -537,6 +547,21 @@
537547
<xs:documentation>CERN Open Hardware Licence v1.2</xs:documentation>
538548
</xs:annotation>
539549
</xs:enumeration>
550+
<xs:enumeration value="CERN-OHL-P-2.0">
551+
<xs:annotation>
552+
<xs:documentation>CERN Open Hardware Licence Version 2 - Permissive</xs:documentation>
553+
</xs:annotation>
554+
</xs:enumeration>
555+
<xs:enumeration value="CERN-OHL-S-2.0">
556+
<xs:annotation>
557+
<xs:documentation>CERN Open Hardware Licence Version 2 - Strongly Reciprocal</xs:documentation>
558+
</xs:annotation>
559+
</xs:enumeration>
560+
<xs:enumeration value="CERN-OHL-W-2.0">
561+
<xs:annotation>
562+
<xs:documentation>CERN Open Hardware Licence Version 2 - Weakly Reciprocal</xs:documentation>
563+
</xs:annotation>
564+
</xs:enumeration>
540565
<xs:enumeration value="CNRI-Jython">
541566
<xs:annotation>
542567
<xs:documentation>CNRI Jython License</xs:documentation>
@@ -897,6 +922,11 @@
897922
<xs:documentation>Haskell Language Report License</xs:documentation>
898923
</xs:annotation>
899924
</xs:enumeration>
925+
<xs:enumeration value="Hippocratic-2.1">
926+
<xs:annotation>
927+
<xs:documentation>Hippocratic License 2.1</xs:documentation>
928+
</xs:annotation>
929+
</xs:enumeration>
900930
<xs:enumeration value="IBM-pibs">
901931
<xs:annotation>
902932
<xs:documentation>IBM PowerPC Initialization and Boot Software</xs:documentation>
@@ -1207,6 +1237,11 @@
12071237
<xs:documentation>Mulan Permissive Software License, Version 1</xs:documentation>
12081238
</xs:annotation>
12091239
</xs:enumeration>
1240+
<xs:enumeration value="MulanPSL-2.0">
1241+
<xs:annotation>
1242+
<xs:documentation>Mulan Permissive Software License, Version 2</xs:documentation>
1243+
</xs:annotation>
1244+
</xs:enumeration>
12101245
<xs:enumeration value="Multics">
12111246
<xs:annotation>
12121247
<xs:documentation>Multics License</xs:documentation>
@@ -1227,6 +1262,11 @@
12271262
<xs:documentation>Net Boolean Public License v1</xs:documentation>
12281263
</xs:annotation>
12291264
</xs:enumeration>
1265+
<xs:enumeration value="NCGL-UK-2.0">
1266+
<xs:annotation>
1267+
<xs:documentation>Non-Commercial Government Licence</xs:documentation>
1268+
</xs:annotation>
1269+
</xs:enumeration>
12301270
<xs:enumeration value="NCSA">
12311271
<xs:annotation>
12321272
<xs:documentation>University of Illinois/NCSA Open Source License</xs:documentation>
@@ -1317,6 +1357,11 @@
13171357
<xs:documentation>Nunit License</xs:documentation>
13181358
</xs:annotation>
13191359
</xs:enumeration>
1360+
<xs:enumeration value="O-UDA-1.0">
1361+
<xs:annotation>
1362+
<xs:documentation>Open Use of Data Agreement v1.0</xs:documentation>
1363+
</xs:annotation>
1364+
</xs:enumeration>
13201365
<xs:enumeration value="OCCT-PL">
13211366
<xs:annotation>
13221367
<xs:documentation>Open CASCADE Technology Public License</xs:documentation>
@@ -1367,6 +1412,11 @@
13671412
<xs:documentation>SIL Open Font License 1.1 with no Reserved Font Name</xs:documentation>
13681413
</xs:annotation>
13691414
</xs:enumeration>
1415+
<xs:enumeration value="OGC-1.0">
1416+
<xs:annotation>
1417+
<xs:documentation>OGC Software License, Version 1.0</xs:documentation>
1418+
</xs:annotation>
1419+
</xs:enumeration>
13701420
<xs:enumeration value="OGL-Canada-2.0">
13711421
<xs:annotation>
13721422
<xs:documentation>Open Government Licence - Canada</xs:documentation>
@@ -1542,11 +1592,26 @@
15421592
<xs:documentation>The Parity Public License 6.0.0</xs:documentation>
15431593
</xs:annotation>
15441594
</xs:enumeration>
1595+
<xs:enumeration value="Parity-7.0.0">
1596+
<xs:annotation>
1597+
<xs:documentation>The Parity Public License 7.0.0</xs:documentation>
1598+
</xs:annotation>
1599+
</xs:enumeration>
15451600
<xs:enumeration value="Plexus">
15461601
<xs:annotation>
15471602
<xs:documentation>Plexus Classworlds License</xs:documentation>
15481603
</xs:annotation>
15491604
</xs:enumeration>
1605+
<xs:enumeration value="PolyForm-Noncommercial-1.0.0">
1606+
<xs:annotation>
1607+
<xs:documentation>PolyForm Noncommercial License 1.0.0</xs:documentation>
1608+
</xs:annotation>
1609+
</xs:enumeration>
1610+
<xs:enumeration value="PolyForm-Small-Business-1.0.0">
1611+
<xs:annotation>
1612+
<xs:documentation>PolyForm Small Business License 1.0.0</xs:documentation>
1613+
</xs:annotation>
1614+
</xs:enumeration>
15501615
<xs:enumeration value="PostgreSQL">
15511616
<xs:annotation>
15521617
<xs:documentation>PostgreSQL License</xs:documentation>
@@ -2093,6 +2158,11 @@
20932158
<xs:documentation>GNU JavaMail exception</xs:documentation>
20942159
</xs:annotation>
20952160
</xs:enumeration>
2161+
<xs:enumeration value="LGPL-3.0-linking-exception">
2162+
<xs:annotation>
2163+
<xs:documentation>LGPL-3.0 Linking Exception</xs:documentation>
2164+
</xs:annotation>
2165+
</xs:enumeration>
20962166
<xs:enumeration value="DigiRule-FOSS-exception">
20972167
<xs:annotation>
20982168
<xs:documentation>DigiRule FOSS License Exception</xs:documentation>
@@ -2178,6 +2248,11 @@
21782248
<xs:documentation>Bootloader Distribution Exception</xs:documentation>
21792249
</xs:annotation>
21802250
</xs:enumeration>
2251+
<xs:enumeration value="SHL-2.0">
2252+
<xs:annotation>
2253+
<xs:documentation>Solderpad Hardware License v2.0</xs:documentation>
2254+
</xs:annotation>
2255+
</xs:enumeration>
21812256
<xs:enumeration value="Classpath-exception-2.0">
21822257
<xs:annotation>
21832258
<xs:documentation>Classpath exception 2.0</xs:documentation>
@@ -2238,6 +2313,11 @@
22382313
<xs:documentation>Qt LGPL exception 1.1</xs:documentation>
22392314
</xs:annotation>
22402315
</xs:enumeration>
2316+
<xs:enumeration value="SHL-2.1">
2317+
<xs:annotation>
2318+
<xs:documentation>Solderpad Hardware License v2.1</xs:documentation>
2319+
</xs:annotation>
2320+
</xs:enumeration>
22412321
<xs:enumeration value="Qt-GPL-exception-1.0">
22422322
<xs:annotation>
22432323
<xs:documentation>Qt GPL exception 1.0</xs:documentation>

‎tools/src/main/java/org/cyclonedx/tools/SpdxXsdGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public class SpdxXsdGenerator {
3131

32-
private static final String SPDX_VERSION = "3.8";
32+
private static final String SPDX_VERSION = "3.9";
3333

3434
public static void main(String args[]) throws Exception {
3535

0 commit comments

Comments
 (0)