From e2d06cecb7f7581c1dba939c28555e1b48e62391 Mon Sep 17 00:00:00 2001 From: Marc-Etienne Vargenau Date: Mon, 17 Oct 2022 19:45:36 +0200 Subject: [PATCH] chore: handle deprecated SPDX license: StandardML-NJ (#1266) --- internal/spdxlicense/generate/generate_license_list_test.go | 2 +- internal/spdxlicense/generate/license.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/spdxlicense/generate/generate_license_list_test.go b/internal/spdxlicense/generate/generate_license_list_test.go index 16daea031..33a89319b 100644 --- a/internal/spdxlicense/generate/generate_license_list_test.go +++ b/internal/spdxlicense/generate/generate_license_list_test.go @@ -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/generate/license.go b/internal/spdxlicense/generate/license.go index 74a309cf3..e81fadbcf 100644 --- a/internal/spdxlicense/generate/license.go +++ b/internal/spdxlicense/generate/license.go @@ -39,6 +39,8 @@ func (l License) canReplace(other License) bool { return true case l.ID == "bzip2-1.0.6" && other.ID == "bzip2-1.0.5": return true + case l.ID == "SMLNJ" && other.ID == "StandardML-NJ": + return true } }