feat(spdx-utils)!: Remove tolerating trailing zero differences

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

Author: sschuberth

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

@@ -23,41 +23,22 @@
 ---
 
 AFLv2.1: AFL-2.1
-ALv2: Apache-2.0
-APACHEv2: Apache-2.0
-APL2: Apache-2.0
 APLv2.0: Apache-2.0
-Apache-2: Apache-2.0
 Apache2.0: Apache-2.0
-Apache2: Apache-2.0
 BSD-3: BSD-3-Clause
 BSD2: BSD-2-Clause
 BSD3: BSD-3-Clause
 Bouncy: MIT
 EDL-1.0: BSD-3-Clause
 FreeBSD: BSD-2-Clause-Views
-GPL-2: GPL-2.0-only
-GPL2: GPL-2.0-only
-GPLv2+: GPL-2.0-or-later
-GPLv2: GPL-2.0-only
-GPLv3+: GPL-3.0-or-later
-GPLv3: GPL-3.0-only
 ISCL: ISC
-LGPL-3: LGPL-3.0-only
-LGPL3: LGPL-3.0-only
-LGPLv3+: LGPL-3.0-or-later
-LGPLv3: LGPL-3.0-only
 MIT-like: MIT
 MIT-style: MIT
 MPLv2.0: MPL-2.0
-MPLv2: MPL-2.0
-PSF2: PSF-2.0
 UNLICENSED: Unlicense
 Unlicence: Unlicense
-afl-2: AFL-2.0
 afl2.0: AFL-2.0
 afl2.1: AFL-2.1
-afl2: AFL-2.0
 bouncy-license: MIT
 bsl1.0: BSL-1.0
 cddl1.0: CDDL-1.0
@@ -67,12 +48,9 @@ epl2.0: EPL-2.0
 eupl1.0: EUPL-1.0
 eupl1.1: EUPL-1.1
 eupl1.2: EUPL-1.2
-gpl3: GPL-3.0-only
 isc-license: ISC
 mit-license: MIT
 mit-licensed: MIT
-mpl-2: MPL-2.0
 mpl2.0: MPL-2.0
-mpl2: MPL-2.0
 w3cl: W3C
 wtf: WTFPL

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

@@ -58,7 +58,7 @@ class SpdxSimpleLicenseMappingTest : WordSpec({
             }
         }
 
-        "contain equal digits omitting trailing zeros" {
+        "contain equal digits" {
             val exceptions = mapOf(
                 // See https://www.eclipse.org/org/documents/edl-v10.php.
                 "EDL-1.0" to SpdxLicense.BSD_3_CLAUSE,
@@ -69,8 +69,8 @@ class SpdxSimpleLicenseMappingTest : WordSpec({
             SpdxSimpleLicenseMapping.simpleLicenseMapping.filterNot {
                 it in exceptions.entries
             }.forAll { (key, license) ->
-                val digitsInKey = key.filter { it.isDigit() }.dropLastWhile { it == '0' }
-                val digitsInLicense = license.id.filter { it.isDigit() }.dropLastWhile { it == '0' }
+                val digitsInKey = key.filter { it.isDigit() }
+                val digitsInLicense = license.id.filter { it.isDigit() }
                 digitsInKey shouldBe digitsInLicense
             }
         }