Skip to content

Commit cb17687

Browse files
alcoholalcohol
authored
Merge pull request #20 from legoktm/spdx-3.1
Update to SPDX 3.1
2 parents 7e111c5 + ce81807 commit cb17687

File tree

3 files changed

+60
-34
lines changed

3 files changed

+60
-34
lines changed

‎res/spdx-exceptions.json

+6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
"Linux-syscall-note": [
5757
"Linux Syscall Note"
5858
],
59+
"LLVM-exception": [
60+
"LLVM Exception"
61+
],
5962
"LZMA-exception": [
6063
"LZMA exception"
6164
],
@@ -68,6 +71,9 @@
6871
"OCCT-exception-1.0": [
6972
"Open CASCADE Exception 1.0"
7073
],
74+
"OpenJDK-assembly-exception-1.0": [
75+
"OpenJDK Assembly exception 1.0"
76+
],
7177
"openvpn-openssl-exception": [
7278
"OpenVPN OpenSSL Exception"
7379
],

‎res/spdx-licenses.json

+51-31
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@
6262
"AGPL-1.0": [
6363
"Affero General Public License v1.0",
6464
false,
65+
true
66+
],
67+
"AGPL-1.0-only": [
68+
"Affero General Public License v1.0 only",
69+
false,
70+
false
71+
],
72+
"AGPL-1.0-or-later": [
73+
"Affero General Public License v1.0 or later",
74+
false,
6575
false
6676
],
6777
"AGPL-3.0": [
@@ -305,152 +315,152 @@
305315
false
306316
],
307317
"CC-BY-1.0": [
308-
"Creative Commons Attribution 1.0",
318+
"Creative Commons Attribution 1.0 Generic",
309319
false,
310320
false
311321
],
312322
"CC-BY-2.0": [
313-
"Creative Commons Attribution 2.0",
323+
"Creative Commons Attribution 2.0 Generic",
314324
false,
315325
false
316326
],
317327
"CC-BY-2.5": [
318-
"Creative Commons Attribution 2.5",
328+
"Creative Commons Attribution 2.5 Generic",
319329
false,
320330
false
321331
],
322332
"CC-BY-3.0": [
323-
"Creative Commons Attribution 3.0",
333+
"Creative Commons Attribution 3.0 Unported",
324334
false,
325335
false
326336
],
327337
"CC-BY-4.0": [
328-
"Creative Commons Attribution 4.0",
338+
"Creative Commons Attribution 4.0 International",
329339
false,
330340
false
331341
],
332342
"CC-BY-NC-1.0": [
333-
"Creative Commons Attribution Non Commercial 1.0",
343+
"Creative Commons Attribution Non Commercial 1.0 Generic",
334344
false,
335345
false
336346
],
337347
"CC-BY-NC-2.0": [
338-
"Creative Commons Attribution Non Commercial 2.0",
348+
"Creative Commons Attribution Non Commercial 2.0 Generic",
339349
false,
340350
false
341351
],
342352
"CC-BY-NC-2.5": [
343-
"Creative Commons Attribution Non Commercial 2.5",
353+
"Creative Commons Attribution Non Commercial 2.5 Generic",
344354
false,
345355
false
346356
],
347357
"CC-BY-NC-3.0": [
348-
"Creative Commons Attribution Non Commercial 3.0",
358+
"Creative Commons Attribution Non Commercial 3.0 Unported",
349359
false,
350360
false
351361
],
352362
"CC-BY-NC-4.0": [
353-
"Creative Commons Attribution Non Commercial 4.0",
363+
"Creative Commons Attribution Non Commercial 4.0 International",
354364
false,
355365
false
356366
],
357367
"CC-BY-NC-ND-1.0": [
358-
"Creative Commons Attribution Non Commercial No Derivatives 1.0",
368+
"Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic",
359369
false,
360370
false
361371
],
362372
"CC-BY-NC-ND-2.0": [
363-
"Creative Commons Attribution Non Commercial No Derivatives 2.0",
373+
"Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic",
364374
false,
365375
false
366376
],
367377
"CC-BY-NC-ND-2.5": [
368-
"Creative Commons Attribution Non Commercial No Derivatives 2.5",
378+
"Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic",
369379
false,
370380
false
371381
],
372382
"CC-BY-NC-ND-3.0": [
373-
"Creative Commons Attribution Non Commercial No Derivatives 3.0",
383+
"Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported",
374384
false,
375385
false
376386
],
377387
"CC-BY-NC-ND-4.0": [
378-
"Creative Commons Attribution Non Commercial No Derivatives 4.0",
388+
"Creative Commons Attribution Non Commercial No Derivatives 4.0 International",
379389
false,
380390
false
381391
],
382392
"CC-BY-NC-SA-1.0": [
383-
"Creative Commons Attribution Non Commercial Share Alike 1.0",
393+
"Creative Commons Attribution Non Commercial Share Alike 1.0 Generic",
384394
false,
385395
false
386396
],
387397
"CC-BY-NC-SA-2.0": [
388-
"Creative Commons Attribution Non Commercial Share Alike 2.0",
398+
"Creative Commons Attribution Non Commercial Share Alike 2.0 Generic",
389399
false,
390400
false
391401
],
392402
"CC-BY-NC-SA-2.5": [
393-
"Creative Commons Attribution Non Commercial Share Alike 2.5",
403+
"Creative Commons Attribution Non Commercial Share Alike 2.5 Generic",
394404
false,
395405
false
396406
],
397407
"CC-BY-NC-SA-3.0": [
398-
"Creative Commons Attribution Non Commercial Share Alike 3.0",
408+
"Creative Commons Attribution Non Commercial Share Alike 3.0 Unported",
399409
false,
400410
false
401411
],
402412
"CC-BY-NC-SA-4.0": [
403-
"Creative Commons Attribution Non Commercial Share Alike 4.0",
413+
"Creative Commons Attribution Non Commercial Share Alike 4.0 International",
404414
false,
405415
false
406416
],
407417
"CC-BY-ND-1.0": [
408-
"Creative Commons Attribution No Derivatives 1.0",
418+
"Creative Commons Attribution No Derivatives 1.0 Generic",
409419
false,
410420
false
411421
],
412422
"CC-BY-ND-2.0": [
413-
"Creative Commons Attribution No Derivatives 2.0",
423+
"Creative Commons Attribution No Derivatives 2.0 Generic",
414424
false,
415425
false
416426
],
417427
"CC-BY-ND-2.5": [
418-
"Creative Commons Attribution No Derivatives 2.5",
428+
"Creative Commons Attribution No Derivatives 2.5 Generic",
419429
false,
420430
false
421431
],
422432
"CC-BY-ND-3.0": [
423-
"Creative Commons Attribution No Derivatives 3.0",
433+
"Creative Commons Attribution No Derivatives 3.0 Unported",
424434
false,
425435
false
426436
],
427437
"CC-BY-ND-4.0": [
428-
"Creative Commons Attribution No Derivatives 4.0",
438+
"Creative Commons Attribution No Derivatives 4.0 International",
429439
false,
430440
false
431441
],
432442
"CC-BY-SA-1.0": [
433-
"Creative Commons Attribution Share Alike 1.0",
443+
"Creative Commons Attribution Share Alike 1.0 Generic",
434444
false,
435445
false
436446
],
437447
"CC-BY-SA-2.0": [
438-
"Creative Commons Attribution Share Alike 2.0",
448+
"Creative Commons Attribution Share Alike 2.0 Generic",
439449
false,
440450
false
441451
],
442452
"CC-BY-SA-2.5": [
443-
"Creative Commons Attribution Share Alike 2.5",
453+
"Creative Commons Attribution Share Alike 2.5 Generic",
444454
false,
445455
false
446456
],
447457
"CC-BY-SA-3.0": [
448-
"Creative Commons Attribution Share Alike 3.0",
458+
"Creative Commons Attribution Share Alike 3.0 Unported",
449459
false,
450460
false
451461
],
452462
"CC-BY-SA-4.0": [
453-
"Creative Commons Attribution Share Alike 4.0",
463+
"Creative Commons Attribution Share Alike 4.0 International",
454464
false,
455465
false
456466
],
@@ -1015,7 +1025,7 @@
10151025
true
10161026
],
10171027
"LGPL-2.1+": [
1018-
"GNU Library General Public License v2 or later",
1028+
"GNU Library General Public License v2.1 or later",
10191029
true,
10201030
true
10211031
],
@@ -1079,6 +1089,11 @@
10791089
true,
10801090
false
10811091
],
1092+
"Linux-OpenIB": [
1093+
"Linux Kernel Variant of OpenIB.org license",
1094+
false,
1095+
false
1096+
],
10821097
"LPL-1.0": [
10831098
"Lucent Public License Version 1.0",
10841099
true,
@@ -1129,6 +1144,11 @@
11291144
true,
11301145
false
11311146
],
1147+
"MIT-0": [
1148+
"MIT No Attribution",
1149+
true,
1150+
false
1151+
],
11321152
"MIT-advertising": [
11331153
"Enlightenment License (e16)",
11341154
false,

‎tests/SpdxLicensesTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public function testResourceFilesContainJson($file)
132132

133133
public function testGetLicenseByIdentifier()
134134
{
135-
$license = $this->licenses->getLicenseByIdentifier('AGPL-1.0');
136-
$this->assertEquals('Affero General Public License v1.0', $license[0]);
135+
$license = $this->licenses->getLicenseByIdentifier('AGPL-1.0-only');
136+
$this->assertEquals('Affero General Public License v1.0 only', $license[0]);
137137
$this->assertFalse($license[1]);
138138
$this->assertStringStartsWith('https://spdx.org/licenses/', $license[2]);
139139
$this->assertFalse($license[3]);
@@ -149,7 +149,7 @@ public function testGetLicenses()
149149
$this->assertArrayHasKey('cc-by-sa-4.0', $results);
150150
$this->assertArrayHasKey(0, $results['cc-by-sa-4.0']);
151151
$this->assertEquals('CC-BY-SA-4.0', $results['cc-by-sa-4.0'][0]);
152-
$this->assertEquals('Creative Commons Attribution Share Alike 4.0', $results['cc-by-sa-4.0'][1]);
152+
$this->assertEquals('Creative Commons Attribution Share Alike 4.0 International', $results['cc-by-sa-4.0'][1]);
153153
$this->assertEquals(false, $results['cc-by-sa-4.0'][2]);
154154
$this->assertEquals(false, $results['cc-by-sa-4.0'][3]);
155155
}

0 commit comments

Comments
 (0)