Update to version 3.6 of the SPDX license list

Cargo.toml

@@ -3,7 +3,7 @@ name = "license-exprs"
 version = "1.4.0"
 authors = ["Without Boats <[email protected]>"]
 license = "Apache-2.0 OR MIT"
-description = "Validate SPDX 2.1 license expressions using SPDX License List 3.1 identifiers."
+description = "Validate SPDX 2.1 license expressions using SPDX License List 3.6 identifiers."
 repository = "https://github.com/withoutboats/license-exprs"
 
 [workspace]

README.md

@@ -1,6 +1,6 @@
 # license-exprs
 
-This crate validates [SPDX 2.1 license expressions][SPDX-license-expressions] using short identifiers from the [SPDX 3.1 License List][SPDX-license-list].
+This crate validates [SPDX 2.1 license expressions][SPDX-license-expressions] using short identifiers from the [SPDX 3.6 License List][SPDX-license-list].
 
 ## Limitations
 
@@ -14,4 +14,4 @@ Licensed under the [Apache License, Version 2.0][Apache-2.0] ([`LICENSE-APACHE`]
 [MIT]: https://opensource.org/licenses/MIT
 [parens]: https://github.com/rust-lang-nursery/license-exprs/issues/3
 [SPDX-license-expressions]: https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60
-[SPDX-license-list]: https://github.com/spdx/license-list-data/tree/v3.1
+[SPDX-license-list]: https://github.com/spdx/license-list-data/tree/v3.6

src/spdx.rs

@@ -7,7 +7,7 @@
  * cargo run -p fetch-license-list-from-spdx v3.0 > src/spdx.rs
  */
 
-pub const VERSION: &'static str = "3.1";
+pub const VERSION: &'static str = "3.6";
 
 pub const LICENSES: &'static [&'static str] = &[
     "0BSD",
@@ -58,6 +58,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "BSD-3-Clause-No-Nuclear-License",
     "BSD-3-Clause-No-Nuclear-License-2014",
     "BSD-3-Clause-No-Nuclear-Warranty",
+    "BSD-3-Clause-Open-MPI",
     "BSD-4-Clause",
     "BSD-4-Clause-UC",
     "BSD-Protection",
@@ -68,6 +69,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "Beerware",
     "BitTorrent-1.0",
     "BitTorrent-1.1",
+    "BlueOak-1.0.0",
     "Borceux",
     "CATOSL-1.1",
     "CC-BY-1.0",
@@ -100,6 +102,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "CC-BY-SA-2.5",
     "CC-BY-SA-3.0",
     "CC-BY-SA-4.0",
+    "CC-PDDC",
     "CC0-1.0",
     "CDDL-1.0",
     "CDDL-1.1",
@@ -111,6 +114,8 @@ pub const LICENSES: &'static [&'static str] = &[
     "CECILL-2.1",
     "CECILL-B",
     "CECILL-C",
+    "CERN-OHL-1.1",
+    "CERN-OHL-1.2",
     "CNRI-Jython",
     "CNRI-Python",
     "CNRI-Python-GPL-Compatible",
@@ -181,6 +186,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "Glide",
     "Glulxe",
     "HPND",
+    "HPND-sell-variant",
     "HaskellReport",
     "IBM-pibs",
     "ICU",
@@ -194,6 +200,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "Intel",
     "Intel-ACPI",
     "Interbase-1.0",
+    "JPNIC",
     "JSON",
     "JasPer-2.0",
     "LAL-1.2",
@@ -265,9 +272,13 @@ pub const LICENSES: &'static [&'static str] = &[
     "Nunit",
     "OCCT-PL",
     "OCLC-2.0",
+    "ODC-By-1.0",
     "ODbL-1.0",
     "OFL-1.0",
     "OFL-1.1",
+    "OGL-UK-1.0",
+    "OGL-UK-2.0",
+    "OGL-UK-3.0",
     "OGTSL",
     "OLDAP-1.1",
     "OLDAP-1.2",
@@ -297,6 +308,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "PDDL-1.0",
     "PHP-3.0",
     "PHP-3.01",
+    "Parity-6.0.0",
     "Plexus",
     "PostgreSQL",
     "Python-2.0",
@@ -315,27 +327,34 @@ pub const LICENSES: &'static [&'static str] = &[
     "SGI-B-1.0",
     "SGI-B-1.1",
     "SGI-B-2.0",
+    "SHL-0.5",
+    "SHL-0.51",
     "SISSL",
     "SISSL-1.2",
     "SMLNJ",
     "SMPPL",
     "SNIA",
     "SPL-1.0",
+    "SSPL-1.0",
     "SWL",
     "Saxpath",
     "Sendmail",
+    "Sendmail-8.23",
     "SimPL-2.0",
     "Sleepycat",
     "Spencer-86",
     "Spencer-94",
     "Spencer-99",
     "StandardML-NJ",
     "SugarCRM-1.1.3",
+    "TAPR-OHL-1.0",
     "TCL",
     "TCP-wrappers",
     "TMate",
     "TORQUE-1.1",
     "TOSL",
+    "TU-Berlin-1.0",
+    "TU-Berlin-2.0",
     "UPL-1.0",
     "Unicode-DFS-2015",
     "Unicode-DFS-2016",
@@ -365,8 +384,11 @@ pub const LICENSES: &'static [&'static str] = &[
     "Zimbra-1.3",
     "Zimbra-1.4",
     "Zlib",
+    "blessing",
     "bzip2-1.0.5",
     "bzip2-1.0.6",
+    "copyleft-next-0.3.0",
+    "copyleft-next-0.3.1",
     "curl",
     "diffmark",
     "dvipdfm",
@@ -375,6 +397,7 @@ pub const LICENSES: &'static [&'static str] = &[
     "gSOAP-1.3b",
     "gnuplot",
     "iMatix",
+    "libpng-2.0",
     "libtiff",
     "mpich2",
     "psfrag",
@@ -399,14 +422,21 @@ pub const EXCEPTIONS: &'static [&'static str] = &[
     "Font-exception-2.0",
     "GCC-exception-2.0",
     "GCC-exception-3.1",
+    "GPL-CC-1.0",
     "LLVM-exception",
     "LZMA-exception",
     "Libtool-exception",
     "Linux-syscall-note",
     "Nokia-Qt-exception-1.1",
     "OCCT-exception-1.0",
+    "OCaml-LGPL-linking-exception",
     "OpenJDK-assembly-exception-1.0",
+    "PS-or-PDF-font-exception-20170817",
+    "Qt-GPL-exception-1.0",
+    "Qt-LGPL-exception-1.1",
     "Qwt-exception-1.0",
+    "Swift-exception",
+    "Universal-FOSS-exception-1.0",
     "WxWindows-exception-3.1",
     "eCos-exception-2.0",
     "freertos-exception-2.0",

tests/validate_license_expr.rs

@@ -23,6 +23,8 @@ fn single_license() {
         " MIT ",
         "    MIT    ",
         "AGPL-1.0+",
+        "BlueOak-1.0.0",
+        "Parity-6.0.0",
     }
 }