diff --git a/internal/spdxlicense/generate/generate_license_list_test.go b/internal/spdxlicense/generate/generate_license_list_test.go index 08a4ae33763..681c3968c3b 100644 --- a/internal/spdxlicense/generate/generate_license_list_test.go +++ b/internal/spdxlicense/generate/generate_license_list_test.go @@ -79,22 +79,22 @@ func Test_processSPDXLicense(t *testing.T) { "afl-3.0": "AFL-3.0", "afl-3.0.0": "AFL-3.0", "afmparse": "Afmparse", - "agpl-1": "AGPL-1.0", + "agpl-1": "AGPL-1.0-only", "agpl-1-only": "AGPL-1.0-only", "agpl-1-or-later": "AGPL-1.0-or-later", - "agpl-1.0": "AGPL-1.0", + "agpl-1.0": "AGPL-1.0-only", "agpl-1.0-only": "AGPL-1.0-only", "agpl-1.0-or-later": "AGPL-1.0-or-later", - "agpl-1.0.0": "AGPL-1.0", + "agpl-1.0.0": "AGPL-1.0-only", "agpl-1.0.0-only": "AGPL-1.0-only", "agpl-1.0.0-or-later": "AGPL-1.0-or-later", - "agpl-3": "AGPL-3.0", + "agpl-3": "AGPL-3.0-only", "agpl-3-only": "AGPL-3.0-only", "agpl-3-or-later": "AGPL-3.0-or-later", - "agpl-3.0": "AGPL-3.0", + "agpl-3.0": "AGPL-3.0-only", "agpl-3.0-only": "AGPL-3.0-only", "agpl-3.0-or-later": "AGPL-3.0-or-later", - "agpl-3.0.0": "AGPL-3.0", + "agpl-3.0.0": "AGPL-3.0-only", "agpl-3.0.0-only": "AGPL-3.0-only", "agpl-3.0.0-or-later": "AGPL-3.0-or-later", "aladdin": "Aladdin", @@ -160,18 +160,18 @@ func Test_processSPDXLicense(t *testing.T) { "bsd-1.0-clause": "BSD-1-Clause", "bsd-1.0.0-clause": "BSD-1-Clause", "bsd-2-clause": "BSD-2-Clause", - "bsd-2-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2-clause-netbsd": "BSD-2-Clause", "bsd-2-clause-patent": "BSD-2-Clause-Patent", "bsd-2-clause-views": "BSD-2-Clause-Views", "bsd-2.0-clause": "BSD-2-Clause", - "bsd-2.0-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2.0-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2.0-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2.0-clause-netbsd": "BSD-2-Clause", "bsd-2.0-clause-patent": "BSD-2-Clause-Patent", "bsd-2.0-clause-views": "BSD-2-Clause-Views", "bsd-2.0.0-clause": "BSD-2-Clause", - "bsd-2.0.0-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2.0.0-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2.0.0-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2.0.0-clause-netbsd": "BSD-2-Clause", "bsd-2.0.0-clause-patent": "BSD-2-Clause-Patent", "bsd-2.0.0-clause-views": "BSD-2-Clause-Views", "bsd-3-clause": "BSD-3-Clause", @@ -221,9 +221,9 @@ func Test_processSPDXLicense(t *testing.T) { "busl-1": "BUSL-1.1", "busl-1.1": "BUSL-1.1", "busl-1.1.0": "BUSL-1.1", - "bzip2-1": "bzip2-1.0.5", - "bzip2-1.0": "bzip2-1.0.5", - "bzip2-1.0.5": "bzip2-1.0.5", + "bzip2-1": "bzip2-1.0.6", + "bzip2-1.0": "bzip2-1.0.6", + "bzip2-1.0.5": "bzip2-1.0.6", "bzip2-1.0.6": "bzip2-1.0.6", "c-uda-1": "C-UDA-1.0", "c-uda-1.0": "C-UDA-1.0", @@ -520,49 +520,49 @@ func Test_processSPDXLicense(t *testing.T) { "fsfullr": "FSFULLR", "ftl": "FTL", "gd": "GD", - "gfdl-1": "GFDL-1.1", + "gfdl-1": "GFDL-1.1-only", "gfdl-1-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1-only": "GFDL-1.1-only", "gfdl-1-or-later": "GFDL-1.1-or-later", - "gfdl-1.1": "GFDL-1.1", + "gfdl-1.1": "GFDL-1.1-only", "gfdl-1.1-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1.1-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1.1-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1.1-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1.1-only": "GFDL-1.1-only", "gfdl-1.1-or-later": "GFDL-1.1-or-later", - "gfdl-1.1.0": "GFDL-1.1", + "gfdl-1.1.0": "GFDL-1.1-only", "gfdl-1.1.0-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1.1.0-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1.1.0-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1.1.0-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1.1.0-only": "GFDL-1.1-only", "gfdl-1.1.0-or-later": "GFDL-1.1-or-later", - "gfdl-1.2": "GFDL-1.2", + "gfdl-1.2": "GFDL-1.2-only", "gfdl-1.2-invariants-only": "GFDL-1.2-invariants-only", "gfdl-1.2-invariants-or-later": "GFDL-1.2-invariants-or-later", "gfdl-1.2-no-invariants-only": "GFDL-1.2-no-invariants-only", "gfdl-1.2-no-invariants-or-later": "GFDL-1.2-no-invariants-or-later", "gfdl-1.2-only": "GFDL-1.2-only", "gfdl-1.2-or-later": "GFDL-1.2-or-later", - "gfdl-1.2.0": "GFDL-1.2", + "gfdl-1.2.0": "GFDL-1.2-only", "gfdl-1.2.0-invariants-only": "GFDL-1.2-invariants-only", "gfdl-1.2.0-invariants-or-later": "GFDL-1.2-invariants-or-later", "gfdl-1.2.0-no-invariants-only": "GFDL-1.2-no-invariants-only", "gfdl-1.2.0-no-invariants-or-later": "GFDL-1.2-no-invariants-or-later", "gfdl-1.2.0-only": "GFDL-1.2-only", "gfdl-1.2.0-or-later": "GFDL-1.2-or-later", - "gfdl-1.3": "GFDL-1.3", + "gfdl-1.3": "GFDL-1.3-only", "gfdl-1.3-invariants-only": "GFDL-1.3-invariants-only", "gfdl-1.3-invariants-or-later": "GFDL-1.3-invariants-or-later", "gfdl-1.3-no-invariants-only": "GFDL-1.3-no-invariants-only", "gfdl-1.3-no-invariants-or-later": "GFDL-1.3-no-invariants-or-later", "gfdl-1.3-only": "GFDL-1.3-only", "gfdl-1.3-or-later": "GFDL-1.3-or-later", - "gfdl-1.3.0": "GFDL-1.3", + "gfdl-1.3.0": "GFDL-1.3-only", "gfdl-1.3.0-invariants-only": "GFDL-1.3-invariants-only", "gfdl-1.3.0-invariants-or-later": "GFDL-1.3-invariants-or-later", "gfdl-1.3.0-no-invariants-only": "GFDL-1.3-no-invariants-only", @@ -591,47 +591,47 @@ func Test_processSPDXLicense(t *testing.T) { "gpl-2+": "GPL-2.0-or-later", "gpl-2-only": "GPL-2.0-only", "gpl-2-or-later": "GPL-2.0-or-later", - "gpl-2-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2-with-font-exception": "GPL-2.0-with-font-exception", - "gpl-2-with-gcc-exception": "GPL-2.0-with-GCC-exception", + "gpl-2-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", + "gpl-2-with-gcc-exception": "GPL-2.0-only WITH GCC-exception-2.0", "gpl-2.0": "GPL-2.0-only", "gpl-2.0+": "GPL-2.0-or-later", "gpl-2.0-only": "GPL-2.0-only", "gpl-2.0-or-later": "GPL-2.0-or-later", - "gpl-2.0-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2.0-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2.0-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2.0-with-font-exception": "GPL-2.0-with-font-exception", + "gpl-2.0-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2.0-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2.0-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2.0-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", "gpl-2.0-with-gcc-exception": "GPL-2.0-with-GCC-exception", "gpl-2.0.0": "GPL-2.0-only", "gpl-2.0.0+": "GPL-2.0-or-later", "gpl-2.0.0-only": "GPL-2.0-only", "gpl-2.0.0-or-later": "GPL-2.0-or-later", - "gpl-2.0.0-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2.0.0-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2.0.0-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2.0.0-with-font-exception": "GPL-2.0-with-font-exception", - "gpl-2.0.0-with-gcc-exception": "GPL-2.0-with-GCC-exception", + "gpl-2.0.0-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2.0.0-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2.0.0-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2.0.0-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", + "gpl-2.0.0-with-gcc-exception": "GPL-2.0-only WITH GCC-exception-2.0", "gpl-3": "GPL-3.0-only", "gpl-3+": "GPL-3.0-or-later", "gpl-3-only": "GPL-3.0-only", "gpl-3-or-later": "GPL-3.0-or-later", - "gpl-3-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gpl-3.0": "GPL-3.0-only", "gpl-3.0+": "GPL-3.0-or-later", "gpl-3.0-only": "GPL-3.0-only", "gpl-3.0-or-later": "GPL-3.0-or-later", - "gpl-3.0-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3.0-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3.0-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3.0-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gpl-3.0.0": "GPL-3.0-only", "gpl-3.0.0+": "GPL-3.0-or-later", "gpl-3.0.0-only": "GPL-3.0-only", "gpl-3.0.0-or-later": "GPL-3.0-or-later", - "gpl-3.0.0-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3.0.0-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3.0.0-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3.0.0-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gsoap-1.3.0b": "gSOAP-1.3b", "gsoap-1.3b": "gSOAP-1.3b", "gsoap-1b": "gSOAP-1.3b", @@ -686,11 +686,11 @@ func Test_processSPDXLicense(t *testing.T) { "lgpl-2.0.0-only": "LGPL-2.0-only", "lgpl-2.0.0-or-later": "LGPL-2.0-or-later", "lgpl-2.1": "LGPL-2.1-only", - "lgpl-2.1+": "LGPL-2.1+", + "lgpl-2.1+": "LGPL-2.1-or-later", "lgpl-2.1-only": "LGPL-2.1-only", "lgpl-2.1-or-later": "LGPL-2.1-or-later", "lgpl-2.1.0": "LGPL-2.1-only", - "lgpl-2.1.0+": "LGPL-2.1+", + "lgpl-2.1.0+": "LGPL-2.1-or-later", "lgpl-2.1.0-only": "LGPL-2.1-only", "lgpl-2.1.0-or-later": "LGPL-2.1-or-later", "lgpl-3": "LGPL-3.0-only", @@ -1020,7 +1020,7 @@ func Test_processSPDXLicense(t *testing.T) { "sspl-1": "SSPL-1.0", "sspl-1.0": "SSPL-1.0", "sspl-1.0.0": "SSPL-1.0", - "standardml-nj": "StandardML-NJ", + "standardml-nj": "SMLNJ", "sugarcrm-1": "SugarCRM-1.1.3", "sugarcrm-1.1": "SugarCRM-1.1.3", "sugarcrm-1.1.3": "SugarCRM-1.1.3", diff --git a/internal/spdxlicense/license_list.go b/internal/spdxlicense/license_list.go index 65c47f4383f..edf460e2778 100644 --- a/internal/spdxlicense/license_list.go +++ b/internal/spdxlicense/license_list.go @@ -28,22 +28,22 @@ var licenseIDs = map[string]string{ "afl-3.0": "AFL-3.0", "afl-3.0.0": "AFL-3.0", "afmparse": "Afmparse", - "agpl-1": "AGPL-1.0", + "agpl-1": "AGPL-1.0-only", "agpl-1-only": "AGPL-1.0-only", "agpl-1-or-later": "AGPL-1.0-or-later", - "agpl-1.0": "AGPL-1.0", + "agpl-1.0": "AGPL-1.0-only", "agpl-1.0-only": "AGPL-1.0-only", "agpl-1.0-or-later": "AGPL-1.0-or-later", - "agpl-1.0.0": "AGPL-1.0", + "agpl-1.0.0": "AGPL-1.0-only", "agpl-1.0.0-only": "AGPL-1.0-only", "agpl-1.0.0-or-later": "AGPL-1.0-or-later", - "agpl-3": "AGPL-3.0", + "agpl-3": "AGPL-3.0-only", "agpl-3-only": "AGPL-3.0-only", "agpl-3-or-later": "AGPL-3.0-or-later", - "agpl-3.0": "AGPL-3.0", + "agpl-3.0": "AGPL-3.0-only", "agpl-3.0-only": "AGPL-3.0-only", "agpl-3.0-or-later": "AGPL-3.0-or-later", - "agpl-3.0.0": "AGPL-3.0", + "agpl-3.0.0": "AGPL-3.0-only", "agpl-3.0.0-only": "AGPL-3.0-only", "agpl-3.0.0-or-later": "AGPL-3.0-or-later", "aladdin": "Aladdin", @@ -109,18 +109,18 @@ var licenseIDs = map[string]string{ "bsd-1.0-clause": "BSD-1-Clause", "bsd-1.0.0-clause": "BSD-1-Clause", "bsd-2-clause": "BSD-2-Clause", - "bsd-2-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2-clause-netbsd": "BSD-2-Clause", "bsd-2-clause-patent": "BSD-2-Clause-Patent", "bsd-2-clause-views": "BSD-2-Clause-Views", "bsd-2.0-clause": "BSD-2-Clause", - "bsd-2.0-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2.0-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2.0-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2.0-clause-netbsd": "BSD-2-Clause", "bsd-2.0-clause-patent": "BSD-2-Clause-Patent", "bsd-2.0-clause-views": "BSD-2-Clause-Views", "bsd-2.0.0-clause": "BSD-2-Clause", - "bsd-2.0.0-clause-freebsd": "BSD-2-Clause-FreeBSD", - "bsd-2.0.0-clause-netbsd": "BSD-2-Clause-NetBSD", + "bsd-2.0.0-clause-freebsd": "BSD-2-Clause-Views", + "bsd-2.0.0-clause-netbsd": "BSD-2-Clause", "bsd-2.0.0-clause-patent": "BSD-2-Clause-Patent", "bsd-2.0.0-clause-views": "BSD-2-Clause-Views", "bsd-3-clause": "BSD-3-Clause", @@ -170,9 +170,9 @@ var licenseIDs = map[string]string{ "busl-1": "BUSL-1.1", "busl-1.1": "BUSL-1.1", "busl-1.1.0": "BUSL-1.1", - "bzip2-1": "bzip2-1.0.5", - "bzip2-1.0": "bzip2-1.0.5", - "bzip2-1.0.5": "bzip2-1.0.5", + "bzip2-1": "bzip2-1.0.6", + "bzip2-1.0": "bzip2-1.0.6", + "bzip2-1.0.5": "bzip2-1.0.6", "bzip2-1.0.6": "bzip2-1.0.6", "c-uda-1": "C-UDA-1.0", "c-uda-1.0": "C-UDA-1.0", @@ -472,49 +472,49 @@ var licenseIDs = map[string]string{ "fsfullr": "FSFULLR", "ftl": "FTL", "gd": "GD", - "gfdl-1": "GFDL-1.1", + "gfdl-1": "GFDL-1.1-only", "gfdl-1-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1-only": "GFDL-1.1-only", "gfdl-1-or-later": "GFDL-1.1-or-later", - "gfdl-1.1": "GFDL-1.1", + "gfdl-1.1": "GFDL-1.1-only", "gfdl-1.1-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1.1-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1.1-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1.1-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1.1-only": "GFDL-1.1-only", "gfdl-1.1-or-later": "GFDL-1.1-or-later", - "gfdl-1.1.0": "GFDL-1.1", + "gfdl-1.1.0": "GFDL-1.1-only", "gfdl-1.1.0-invariants-only": "GFDL-1.1-invariants-only", "gfdl-1.1.0-invariants-or-later": "GFDL-1.1-invariants-or-later", "gfdl-1.1.0-no-invariants-only": "GFDL-1.1-no-invariants-only", "gfdl-1.1.0-no-invariants-or-later": "GFDL-1.1-no-invariants-or-later", "gfdl-1.1.0-only": "GFDL-1.1-only", "gfdl-1.1.0-or-later": "GFDL-1.1-or-later", - "gfdl-1.2": "GFDL-1.2", + "gfdl-1.2": "GFDL-1.2-only", "gfdl-1.2-invariants-only": "GFDL-1.2-invariants-only", "gfdl-1.2-invariants-or-later": "GFDL-1.2-invariants-or-later", "gfdl-1.2-no-invariants-only": "GFDL-1.2-no-invariants-only", "gfdl-1.2-no-invariants-or-later": "GFDL-1.2-no-invariants-or-later", "gfdl-1.2-only": "GFDL-1.2-only", "gfdl-1.2-or-later": "GFDL-1.2-or-later", - "gfdl-1.2.0": "GFDL-1.2", + "gfdl-1.2.0": "GFDL-1.2-only", "gfdl-1.2.0-invariants-only": "GFDL-1.2-invariants-only", "gfdl-1.2.0-invariants-or-later": "GFDL-1.2-invariants-or-later", "gfdl-1.2.0-no-invariants-only": "GFDL-1.2-no-invariants-only", "gfdl-1.2.0-no-invariants-or-later": "GFDL-1.2-no-invariants-or-later", "gfdl-1.2.0-only": "GFDL-1.2-only", "gfdl-1.2.0-or-later": "GFDL-1.2-or-later", - "gfdl-1.3": "GFDL-1.3", + "gfdl-1.3": "GFDL-1.3-only", "gfdl-1.3-invariants-only": "GFDL-1.3-invariants-only", "gfdl-1.3-invariants-or-later": "GFDL-1.3-invariants-or-later", "gfdl-1.3-no-invariants-only": "GFDL-1.3-no-invariants-only", "gfdl-1.3-no-invariants-or-later": "GFDL-1.3-no-invariants-or-later", "gfdl-1.3-only": "GFDL-1.3-only", "gfdl-1.3-or-later": "GFDL-1.3-or-later", - "gfdl-1.3.0": "GFDL-1.3", + "gfdl-1.3.0": "GFDL-1.3-only", "gfdl-1.3.0-invariants-only": "GFDL-1.3-invariants-only", "gfdl-1.3.0-invariants-or-later": "GFDL-1.3-invariants-or-later", "gfdl-1.3.0-no-invariants-only": "GFDL-1.3-no-invariants-only", @@ -543,47 +543,47 @@ var licenseIDs = map[string]string{ "gpl-2+": "GPL-2.0-or-later", "gpl-2-only": "GPL-2.0-only", "gpl-2-or-later": "GPL-2.0-or-later", - "gpl-2-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2-with-font-exception": "GPL-2.0-with-font-exception", - "gpl-2-with-gcc-exception": "GPL-2.0-with-GCC-exception", + "gpl-2-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", + "gpl-2-with-gcc-exception": "GPL-2.0-only WITH GCC-exception-2.0", "gpl-2.0": "GPL-2.0-only", "gpl-2.0+": "GPL-2.0-or-later", "gpl-2.0-only": "GPL-2.0-only", "gpl-2.0-or-later": "GPL-2.0-or-later", - "gpl-2.0-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2.0-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2.0-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2.0-with-font-exception": "GPL-2.0-with-font-exception", + "gpl-2.0-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2.0-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2.0-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2.0-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", "gpl-2.0-with-gcc-exception": "GPL-2.0-with-GCC-exception", "gpl-2.0.0": "GPL-2.0-only", "gpl-2.0.0+": "GPL-2.0-or-later", "gpl-2.0.0-only": "GPL-2.0-only", "gpl-2.0.0-or-later": "GPL-2.0-or-later", - "gpl-2.0.0-with-autoconf-exception": "GPL-2.0-with-autoconf-exception", - "gpl-2.0.0-with-bison-exception": "GPL-2.0-with-bison-exception", - "gpl-2.0.0-with-classpath-exception": "GPL-2.0-with-classpath-exception", - "gpl-2.0.0-with-font-exception": "GPL-2.0-with-font-exception", - "gpl-2.0.0-with-gcc-exception": "GPL-2.0-with-GCC-exception", + "gpl-2.0.0-with-autoconf-exception": "GPL-2.0-only WITH Autoconf-exception-2.0", + "gpl-2.0.0-with-bison-exception": "GPL-2.0-only WITH Bison-exception-2.2", + "gpl-2.0.0-with-classpath-exception": "GPL-2.0-only WITH Classpath-exception-2.0", + "gpl-2.0.0-with-font-exception": "GPL-2.0-only WITH Font-exception-2.0", + "gpl-2.0.0-with-gcc-exception": "GPL-2.0-only WITH GCC-exception-2.0", "gpl-3": "GPL-3.0-only", "gpl-3+": "GPL-3.0-or-later", "gpl-3-only": "GPL-3.0-only", "gpl-3-or-later": "GPL-3.0-or-later", - "gpl-3-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gpl-3.0": "GPL-3.0-only", "gpl-3.0+": "GPL-3.0-or-later", "gpl-3.0-only": "GPL-3.0-only", "gpl-3.0-or-later": "GPL-3.0-or-later", - "gpl-3.0-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3.0-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3.0-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3.0-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gpl-3.0.0": "GPL-3.0-only", "gpl-3.0.0+": "GPL-3.0-or-later", "gpl-3.0.0-only": "GPL-3.0-only", "gpl-3.0.0-or-later": "GPL-3.0-or-later", - "gpl-3.0.0-with-autoconf-exception": "GPL-3.0-with-autoconf-exception", - "gpl-3.0.0-with-gcc-exception": "GPL-3.0-with-GCC-exception", + "gpl-3.0.0-with-autoconf-exception": "GPL-3.0-only WITH Autoconf-exception-3.0", + "gpl-3.0.0-with-gcc-exception": "GPL-3.0-only WITH GCC-exception-3.1", "gsoap-1.3.0b": "gSOAP-1.3b", "gsoap-1.3b": "gSOAP-1.3b", "gsoap-1b": "gSOAP-1.3b", @@ -637,11 +637,11 @@ var licenseIDs = map[string]string{ "lgpl-2.0.0-only": "LGPL-2.0-only", "lgpl-2.0.0-or-later": "LGPL-2.0-or-later", "lgpl-2.1": "LGPL-2.1-only", - "lgpl-2.1+": "LGPL-2.1+", + "lgpl-2.1+": "LGPL-2.1-or-later", "lgpl-2.1-only": "LGPL-2.1-only", "lgpl-2.1-or-later": "LGPL-2.1-or-later", "lgpl-2.1.0": "LGPL-2.1-only", - "lgpl-2.1.0+": "LGPL-2.1+", + "lgpl-2.1.0+": "LGPL-2.1-or-later", "lgpl-2.1.0-only": "LGPL-2.1-only", "lgpl-2.1.0-or-later": "LGPL-2.1-or-later", "lgpl-3": "LGPL-3.0-only", @@ -984,7 +984,7 @@ var licenseIDs = map[string]string{ "sspl-1": "SSPL-1.0", "sspl-1.0": "SSPL-1.0", "sspl-1.0.0": "SSPL-1.0", - "standardml-nj": "StandardML-NJ", + "standardml-nj": "SMLNJ", "sugarcrm-1": "SugarCRM-1.1.3", "sugarcrm-1.1": "SugarCRM-1.1.3", "sugarcrm-1.1.3": "SugarCRM-1.1.3", diff --git a/internal/spdxlicense/license_test.go b/internal/spdxlicense/license_test.go index 11456f3c386..5913a471760 100644 --- a/internal/spdxlicense/license_test.go +++ b/internal/spdxlicense/license_test.go @@ -29,7 +29,7 @@ func TestIDParse(t *testing.T) { }, { "GPL-3-with-autoconf-exception", - "GPL-3.0-with-autoconf-exception", + "GPL-3.0-only WITH Autoconf-exception-3.0", }, { "CC-by-nc-3-de",