From 54d1686e308e7898a84c8e93423eaf137f801c1e Mon Sep 17 00:00:00 2001 From: Marc-Etienne Vargenau Date: Sat, 15 Oct 2022 13:27:42 +0200 Subject: [PATCH 1/2] One more deprecated SPDX license: StandardML-NJ Follow up of #1179 StandardML-NJ is deprecated and should be replaced by SMLNJ https://spdx.org/licenses/StandardML-NJ.html Signed-off-by: Marc-Etienne Vargenau --- internal/spdxlicense/generate/license.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/spdxlicense/generate/license.go b/internal/spdxlicense/generate/license.go index 74a309cf3ff..e81fadbcf59 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 } } From 5bcba5fcbd2b65aa772e7642dc6b128c04c4a551 Mon Sep 17 00:00:00 2001 From: Marc-Etienne Vargenau Date: Mon, 17 Oct 2022 18:42:56 +0200 Subject: [PATCH 2/2] Fix unit test for deprecated license StandardML-NJ Fix unit test for deprecated license StandardML-NJ Signed-off-by: Marc-Etienne Vargenau --- internal/spdxlicense/generate/generate_license_list_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/spdxlicense/generate/generate_license_list_test.go b/internal/spdxlicense/generate/generate_license_list_test.go index 16daea031bb..33a89319b88 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",