From f107b09d382a45b7d7d00c880dce3ce090322c5e Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 14 Apr 2018 21:53:41 -0700 Subject: [PATCH] Rebuild with 46edc2d (pull: Add deprecated SPDX identifiers) --- GNUGPLv3.json | 3 ++- GPLv2.json | 3 ++- LGPLv2.1.json | 3 ++- LGPLv3.json | 3 ++- StandardMLofNJ.json | 3 ++- ZLib.json | 3 ++- eCos2.0.json | 3 ++- licenses-full.json | 21 ++++++++++++++------- schema/license.jsonld | 16 ++++++++-------- spdx/GPL-2.0+ WITH eCos-exception-2.0.json | 3 ++- spdx/GPL-2.0+.json | 21 +++++++++++++++++++++ spdx/GPL-2.0-only.json | 3 ++- spdx/GPL-2.0-or-later.json | 3 ++- spdx/GPL-2.0.json | 3 ++- spdx/GPL-3.0+.json | 21 +++++++++++++++++++++ spdx/GPL-3.0-only.json | 3 ++- spdx/GPL-3.0-or-later.json | 3 ++- spdx/GPL-3.0.json | 3 ++- spdx/LGPL-2.1+.json | 22 ++++++++++++++++++++++ spdx/LGPL-2.1-only.json | 3 ++- spdx/LGPL-2.1-or-later.json | 3 ++- spdx/LGPL-2.1.json | 3 ++- spdx/LGPL-3.0+.json | 21 +++++++++++++++++++++ spdx/LGPL-3.0-only.json | 3 ++- spdx/LGPL-3.0-or-later.json | 3 ++- spdx/LGPL-3.0.json | 3 ++- spdx/Nunit.json | 20 ++++++++++++++++++++ spdx/SMLNJ.json | 3 ++- spdx/StandardML-NJ.json | 20 ++++++++++++++++++++ spdx/Zlib.json | 3 ++- spdx/eCos-2.0.json | 20 ++++++++++++++++++++ 31 files changed, 211 insertions(+), 37 deletions(-) create mode 100644 spdx/GPL-2.0+.json create mode 100644 spdx/GPL-3.0+.json create mode 100644 spdx/LGPL-2.1+.json create mode 100644 spdx/LGPL-3.0+.json create mode 100644 spdx/Nunit.json create mode 100644 spdx/StandardML-NJ.json create mode 100644 spdx/eCos-2.0.json diff --git a/GNUGPLv3.json b/GNUGPLv3.json index 4d49e7f..563f299 100644 --- a/GNUGPLv3.json +++ b/GNUGPLv3.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-3.0-or-later", "GPL-3.0-only", - "GPL-3.0" + "GPL-3.0", + "GPL-3.0+" ] }, "name": "GNU General Public License (GPL) version 3", diff --git a/GPLv2.json b/GPLv2.json index c814598..5ea8129 100644 --- a/GPLv2.json +++ b/GPLv2.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-2.0-or-later", "GPL-2.0-only", - "GPL-2.0" + "GPL-2.0", + "GPL-2.0+" ] }, "name": "GNU General Public License (GPL) version 2", diff --git a/LGPLv2.1.json b/LGPLv2.1.json index 889e37a..a976bc5 100644 --- a/LGPLv2.1.json +++ b/LGPLv2.1.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-2.1-or-later", "LGPL-2.1-only", - "LGPL-2.1" + "LGPL-2.1", + "LGPL-2.1+" ] }, "name": "GNU Lesser General Public License (LGPL) version 2.1", diff --git a/LGPLv3.json b/LGPLv3.json index e292663..090a389 100644 --- a/LGPLv3.json +++ b/LGPLv3.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-3.0-or-later", "LGPL-3.0-only", - "LGPL-3.0" + "LGPL-3.0", + "LGPL-3.0+" ] }, "name": "GNU Lesser General Public License (LGPL) version 3", diff --git a/StandardMLofNJ.json b/StandardMLofNJ.json index 047a46d..f8b8b9b 100644 --- a/StandardMLofNJ.json +++ b/StandardMLofNJ.json @@ -3,7 +3,8 @@ "id": "StandardMLofNJ", "identifiers": { "spdx": [ - "SMLNJ" + "SMLNJ", + "StandardML-NJ" ] }, "name": "Standard ML of New Jersey Copyright License", diff --git a/ZLib.json b/ZLib.json index 4623e6b..cb183b9 100644 --- a/ZLib.json +++ b/ZLib.json @@ -3,7 +3,8 @@ "id": "ZLib", "identifiers": { "spdx": [ - "Zlib" + "Zlib", + "Nunit" ] }, "name": "License of ZLib", diff --git a/eCos2.0.json b/eCos2.0.json index 602085d..5769612 100644 --- a/eCos2.0.json +++ b/eCos2.0.json @@ -3,7 +3,8 @@ "id": "eCos2.0", "identifiers": { "spdx": [ - "GPL-2.0+ WITH eCos-exception-2.0" + "GPL-2.0+ WITH eCos-exception-2.0", + "eCos-2.0" ] }, "name": "eCos license version 2.0", diff --git a/licenses-full.json b/licenses-full.json index 3d695a6..4a43d61 100644 --- a/licenses-full.json +++ b/licenses-full.json @@ -786,7 +786,8 @@ "spdx": [ "GPL-3.0-or-later", "GPL-3.0-only", - "GPL-3.0" + "GPL-3.0", + "GPL-3.0+" ] }, "name": "GNU General Public License (GPL) version 3", @@ -853,7 +854,8 @@ "spdx": [ "GPL-2.0-or-later", "GPL-2.0-only", - "GPL-2.0" + "GPL-2.0", + "GPL-2.0+" ] }, "name": "GNU General Public License (GPL) version 2", @@ -978,7 +980,8 @@ "spdx": [ "LGPL-2.1-or-later", "LGPL-2.1-only", - "LGPL-2.1" + "LGPL-2.1", + "LGPL-2.1+" ] }, "name": "GNU Lesser General Public License (LGPL) version 2.1", @@ -998,7 +1001,8 @@ "spdx": [ "LGPL-3.0-or-later", "LGPL-3.0-only", - "LGPL-3.0" + "LGPL-3.0", + "LGPL-3.0+" ] }, "name": "GNU Lesser General Public License (LGPL) version 3", @@ -1725,7 +1729,8 @@ "id": "StandardMLofNJ", "identifiers": { "spdx": [ - "SMLNJ" + "SMLNJ", + "StandardML-NJ" ] }, "name": "Standard ML of New Jersey Copyright License", @@ -1991,7 +1996,8 @@ "id": "ZLib", "identifiers": { "spdx": [ - "Zlib" + "Zlib", + "Nunit" ] }, "name": "License of ZLib", @@ -2298,7 +2304,8 @@ "id": "eCos2.0", "identifiers": { "spdx": [ - "GPL-2.0+ WITH eCos-exception-2.0" + "GPL-2.0+ WITH eCos-exception-2.0", + "eCos-2.0" ] }, "name": "eCos license version 2.0", diff --git a/schema/license.jsonld b/schema/license.jsonld index 452aa01..3eb788d 100644 --- a/schema/license.jsonld +++ b/schema/license.jsonld @@ -1,22 +1,22 @@ { "@context": { - "schema": "https://schema.org/", + "uris": { + "@container": "@list", + "@id": "schema:url" + }, + "tags": { + "@id": "schema:keywords" + }, "id": { "@id": "schema:identifier" }, "name": { "@id": "schema:name" }, + "schema": "https://schema.org/", "identifiers": { "@container": "@index", "@id": "schema:identifier" - }, - "uris": { - "@container": "@list", - "@id": "schema:url" - }, - "tags": { - "@id": "schema:keywords" } } } diff --git a/spdx/GPL-2.0+ WITH eCos-exception-2.0.json b/spdx/GPL-2.0+ WITH eCos-exception-2.0.json index 602085d..5769612 100644 --- a/spdx/GPL-2.0+ WITH eCos-exception-2.0.json +++ b/spdx/GPL-2.0+ WITH eCos-exception-2.0.json @@ -3,7 +3,8 @@ "id": "eCos2.0", "identifiers": { "spdx": [ - "GPL-2.0+ WITH eCos-exception-2.0" + "GPL-2.0+ WITH eCos-exception-2.0", + "eCos-2.0" ] }, "name": "eCos license version 2.0", diff --git a/spdx/GPL-2.0+.json b/spdx/GPL-2.0+.json new file mode 100644 index 0000000..5ea8129 --- /dev/null +++ b/spdx/GPL-2.0+.json @@ -0,0 +1,21 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "GPLv2", + "identifiers": { + "spdx": [ + "GPL-2.0-or-later", + "GPL-2.0-only", + "GPL-2.0", + "GPL-2.0+" + ] + }, + "name": "GNU General Public License (GPL) version 2", + "tags": [ + "gpl-2-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#GPLv2", + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" + ] +} diff --git a/spdx/GPL-2.0-only.json b/spdx/GPL-2.0-only.json index c814598..5ea8129 100644 --- a/spdx/GPL-2.0-only.json +++ b/spdx/GPL-2.0-only.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-2.0-or-later", "GPL-2.0-only", - "GPL-2.0" + "GPL-2.0", + "GPL-2.0+" ] }, "name": "GNU General Public License (GPL) version 2", diff --git a/spdx/GPL-2.0-or-later.json b/spdx/GPL-2.0-or-later.json index c814598..5ea8129 100644 --- a/spdx/GPL-2.0-or-later.json +++ b/spdx/GPL-2.0-or-later.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-2.0-or-later", "GPL-2.0-only", - "GPL-2.0" + "GPL-2.0", + "GPL-2.0+" ] }, "name": "GNU General Public License (GPL) version 2", diff --git a/spdx/GPL-2.0.json b/spdx/GPL-2.0.json index c814598..5ea8129 100644 --- a/spdx/GPL-2.0.json +++ b/spdx/GPL-2.0.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-2.0-or-later", "GPL-2.0-only", - "GPL-2.0" + "GPL-2.0", + "GPL-2.0+" ] }, "name": "GNU General Public License (GPL) version 2", diff --git a/spdx/GPL-3.0+.json b/spdx/GPL-3.0+.json new file mode 100644 index 0000000..563f299 --- /dev/null +++ b/spdx/GPL-3.0+.json @@ -0,0 +1,21 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "GNUGPLv3", + "identifiers": { + "spdx": [ + "GPL-3.0-or-later", + "GPL-3.0-only", + "GPL-3.0", + "GPL-3.0+" + ] + }, + "name": "GNU General Public License (GPL) version 3", + "tags": [ + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#GNUGPLv3", + "https://www.gnu.org/licenses/gpl.html" + ] +} diff --git a/spdx/GPL-3.0-only.json b/spdx/GPL-3.0-only.json index 4d49e7f..563f299 100644 --- a/spdx/GPL-3.0-only.json +++ b/spdx/GPL-3.0-only.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-3.0-or-later", "GPL-3.0-only", - "GPL-3.0" + "GPL-3.0", + "GPL-3.0+" ] }, "name": "GNU General Public License (GPL) version 3", diff --git a/spdx/GPL-3.0-or-later.json b/spdx/GPL-3.0-or-later.json index 4d49e7f..563f299 100644 --- a/spdx/GPL-3.0-or-later.json +++ b/spdx/GPL-3.0-or-later.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-3.0-or-later", "GPL-3.0-only", - "GPL-3.0" + "GPL-3.0", + "GPL-3.0+" ] }, "name": "GNU General Public License (GPL) version 3", diff --git a/spdx/GPL-3.0.json b/spdx/GPL-3.0.json index 4d49e7f..563f299 100644 --- a/spdx/GPL-3.0.json +++ b/spdx/GPL-3.0.json @@ -5,7 +5,8 @@ "spdx": [ "GPL-3.0-or-later", "GPL-3.0-only", - "GPL-3.0" + "GPL-3.0", + "GPL-3.0+" ] }, "name": "GNU General Public License (GPL) version 3", diff --git a/spdx/LGPL-2.1+.json b/spdx/LGPL-2.1+.json new file mode 100644 index 0000000..a976bc5 --- /dev/null +++ b/spdx/LGPL-2.1+.json @@ -0,0 +1,22 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "LGPLv2.1", + "identifiers": { + "spdx": [ + "LGPL-2.1-or-later", + "LGPL-2.1-only", + "LGPL-2.1", + "LGPL-2.1+" + ] + }, + "name": "GNU Lesser General Public License (LGPL) version 2.1", + "tags": [ + "gpl-2-compatible", + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#LGPLv2.1", + "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" + ] +} diff --git a/spdx/LGPL-2.1-only.json b/spdx/LGPL-2.1-only.json index 889e37a..a976bc5 100644 --- a/spdx/LGPL-2.1-only.json +++ b/spdx/LGPL-2.1-only.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-2.1-or-later", "LGPL-2.1-only", - "LGPL-2.1" + "LGPL-2.1", + "LGPL-2.1+" ] }, "name": "GNU Lesser General Public License (LGPL) version 2.1", diff --git a/spdx/LGPL-2.1-or-later.json b/spdx/LGPL-2.1-or-later.json index 889e37a..a976bc5 100644 --- a/spdx/LGPL-2.1-or-later.json +++ b/spdx/LGPL-2.1-or-later.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-2.1-or-later", "LGPL-2.1-only", - "LGPL-2.1" + "LGPL-2.1", + "LGPL-2.1+" ] }, "name": "GNU Lesser General Public License (LGPL) version 2.1", diff --git a/spdx/LGPL-2.1.json b/spdx/LGPL-2.1.json index 889e37a..a976bc5 100644 --- a/spdx/LGPL-2.1.json +++ b/spdx/LGPL-2.1.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-2.1-or-later", "LGPL-2.1-only", - "LGPL-2.1" + "LGPL-2.1", + "LGPL-2.1+" ] }, "name": "GNU Lesser General Public License (LGPL) version 2.1", diff --git a/spdx/LGPL-3.0+.json b/spdx/LGPL-3.0+.json new file mode 100644 index 0000000..090a389 --- /dev/null +++ b/spdx/LGPL-3.0+.json @@ -0,0 +1,21 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "LGPLv3", + "identifiers": { + "spdx": [ + "LGPL-3.0-or-later", + "LGPL-3.0-only", + "LGPL-3.0", + "LGPL-3.0+" + ] + }, + "name": "GNU Lesser General Public License (LGPL) version 3", + "tags": [ + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#LGPLv3", + "https://www.gnu.org/licenses/lgpl.html" + ] +} diff --git a/spdx/LGPL-3.0-only.json b/spdx/LGPL-3.0-only.json index e292663..090a389 100644 --- a/spdx/LGPL-3.0-only.json +++ b/spdx/LGPL-3.0-only.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-3.0-or-later", "LGPL-3.0-only", - "LGPL-3.0" + "LGPL-3.0", + "LGPL-3.0+" ] }, "name": "GNU Lesser General Public License (LGPL) version 3", diff --git a/spdx/LGPL-3.0-or-later.json b/spdx/LGPL-3.0-or-later.json index e292663..090a389 100644 --- a/spdx/LGPL-3.0-or-later.json +++ b/spdx/LGPL-3.0-or-later.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-3.0-or-later", "LGPL-3.0-only", - "LGPL-3.0" + "LGPL-3.0", + "LGPL-3.0+" ] }, "name": "GNU Lesser General Public License (LGPL) version 3", diff --git a/spdx/LGPL-3.0.json b/spdx/LGPL-3.0.json index e292663..090a389 100644 --- a/spdx/LGPL-3.0.json +++ b/spdx/LGPL-3.0.json @@ -5,7 +5,8 @@ "spdx": [ "LGPL-3.0-or-later", "LGPL-3.0-only", - "LGPL-3.0" + "LGPL-3.0", + "LGPL-3.0+" ] }, "name": "GNU Lesser General Public License (LGPL) version 3", diff --git a/spdx/Nunit.json b/spdx/Nunit.json new file mode 100644 index 0000000..cb183b9 --- /dev/null +++ b/spdx/Nunit.json @@ -0,0 +1,20 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "ZLib", + "identifiers": { + "spdx": [ + "Zlib", + "Nunit" + ] + }, + "name": "License of ZLib", + "tags": [ + "gpl-2-compatible", + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#ZLib", + "http://directory.fsf.org/wiki/License:Zlib" + ] +} diff --git a/spdx/SMLNJ.json b/spdx/SMLNJ.json index 047a46d..f8b8b9b 100644 --- a/spdx/SMLNJ.json +++ b/spdx/SMLNJ.json @@ -3,7 +3,8 @@ "id": "StandardMLofNJ", "identifiers": { "spdx": [ - "SMLNJ" + "SMLNJ", + "StandardML-NJ" ] }, "name": "Standard ML of New Jersey Copyright License", diff --git a/spdx/StandardML-NJ.json b/spdx/StandardML-NJ.json new file mode 100644 index 0000000..f8b8b9b --- /dev/null +++ b/spdx/StandardML-NJ.json @@ -0,0 +1,20 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "StandardMLofNJ", + "identifiers": { + "spdx": [ + "SMLNJ", + "StandardML-NJ" + ] + }, + "name": "Standard ML of New Jersey Copyright License", + "tags": [ + "gpl-2-compatible", + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#StandardMLofNJ", + "http://directory.fsf.org/wiki/License:StandardMLofNJ" + ] +} diff --git a/spdx/Zlib.json b/spdx/Zlib.json index 4623e6b..cb183b9 100644 --- a/spdx/Zlib.json +++ b/spdx/Zlib.json @@ -3,7 +3,8 @@ "id": "ZLib", "identifiers": { "spdx": [ - "Zlib" + "Zlib", + "Nunit" ] }, "name": "License of ZLib", diff --git a/spdx/eCos-2.0.json b/spdx/eCos-2.0.json new file mode 100644 index 0000000..5769612 --- /dev/null +++ b/spdx/eCos-2.0.json @@ -0,0 +1,20 @@ +{ + "@context": "https://wking.github.io/fsf-api/schema/license.jsonld", + "id": "eCos2.0", + "identifiers": { + "spdx": [ + "GPL-2.0+ WITH eCos-exception-2.0", + "eCos-2.0" + ] + }, + "name": "eCos license version 2.0", + "tags": [ + "gpl-2-compatible", + "gpl-3-compatible", + "libre" + ], + "uris": [ + "https://www.gnu.org/licenses/license-list.html#eCos2.0", + "http://directory.fsf.org/wiki/License:ECos2.0" + ] +} -- 2.25.1