feat(spdx-utils): Add more mappings for deprecated licenses

Fixes #9896.

Signed-off-by: Sebastian Schuberth <[email protected]>

utils/spdx/src/main/resources/deprecated-license-mapping.yml

@@ -22,6 +22,7 @@ AGPL-1.0: AGPL-1.0-only
 AGPL-3.0+: AGPL-3.0-or-later
 AGPL-3.0: AGPL-3.0-only
 BSD-2-Clause-FreeBSD: BSD-2-Clause-Views
+BSD-2-Clause-NetBSD: BSD-2-Clause
 GFDL-1.1+: GFDL-1.1-or-later
 GFDL-1.1: GFDL-1.1-only
 GFDL-1.2+: GFDL-1.2-or-later
@@ -47,3 +48,8 @@ LGPL-2.1+: LGPL-2.1-or-later
 LGPL-2.1: LGPL-2.1-only
 LGPL-3.0+: LGPL-3.0-or-later
 LGPL-3.0: LGPL-3.0-only
+Nunit: zlib-acknowledgement
+StandardML-NJ: SMLNJ
+bzip2-1.0.5: bzip2-1.0.6
+eCos-2.0: GPL-2.0-or-later WITH eCos-exception-2.0
+wxWindows: GPL-2.0-or-later WITH WxWindows-exception-3.1

utils/spdx/src/test/kotlin/SpdxExpressionTest.kt

@@ -433,11 +433,11 @@ class SpdxExpressionTest : WordSpec({
                 "LGPL-3.0".toSpdx().normalize() shouldBe LGPL_3_0_ONLY.toExpression()
                 "LGPL-3.0+".toSpdx().normalize() shouldBe SpdxLicenseIdExpression("LGPL-3.0-or-later", true)
 
-                // These have no known successors, so just keep them.
-                "eCos-2.0".toSpdx().normalize() shouldBe ECOS_2_0.toExpression()
-                "Nunit".toSpdx().normalize() shouldBe NUNIT.toExpression()
-                "StandardML-NJ".toSpdx().normalize() shouldBe STANDARDML_NJ.toExpression()
-                "wxWindows".toSpdx().normalize() shouldBe WXWINDOWS.toExpression()
+                "Nunit".toSpdx().normalize() shouldBe ZLIB_ACKNOWLEDGEMENT.toExpression()
+                "StandardML-NJ".toSpdx().normalize() shouldBe SMLNJ.toExpression()
+                "bzip2-1.0.5".toSpdx().normalize() shouldBe BZIP2_1_0_6.toExpression()
+                "eCos-2.0".toSpdx().normalize() shouldBe (GPL_2_0_OR_LATER with ECOS_EXCEPTION_2_0)
+                "wxWindows".toSpdx().normalize() shouldBe (GPL_2_0_OR_LATER with WXWINDOWS_EXCEPTION_3_1)
             }
         }