fix(reporter): Only write major / minor SPDX license list version info

Fixes #9606. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Dec 13, 2024 · 3c62407 · 3c62407
1 parent 8bc47a4
commit 3c62407
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt b/plugins/reporters/spdx/src/funTest/kotlin/SpdxDocumentReporterFunTest.kt
@@ -164,7 +164,7 @@ private fun TestConfiguration.generateReport(
 
 private fun SpdxDocument.getCustomReplacements() =
     mapOf(
-        "<REPLACE_LICENSE_LIST_VERSION>" to SpdxLicense.LICENSE_LIST_VERSION.substringBefore("-"),
+        "<REPLACE_LICENSE_LIST_VERSION>" to SpdxLicense.LICENSE_LIST_VERSION.split('.').take(2).joinToString("."),
         "<REPLACE_ORT_VERSION>" to Environment.ORT_VERSION,
         "<REPLACE_CREATION_DATE_AND_TIME>" to creationInfo.created.toString(),
         "<REPLACE_DOCUMENT_NAMESPACE>" to documentNamespace

diff --git a/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt b/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt
@@ -172,7 +172,7 @@ internal object SpdxDocumentModelMapper {
                 comment = params.creationInfoComment,
                 created = Instant.now().truncatedTo(ChronoUnit.SECONDS),
                 creators = creators,
-                licenseListVersion = SpdxLicense.LICENSE_LIST_VERSION.substringBefore("-")
+                licenseListVersion = SpdxLicense.LICENSE_LIST_VERSION.split('.').take(2).joinToString(".")
             ),
             documentNamespace = "spdx://${UUID.randomUUID()}",
             documentDescribes = projectPackages.map { it.spdxId },

diff --git a/utils/spdx/src/main/kotlin/model/SpdxCreationInfo.kt b/utils/spdx/src/main/kotlin/model/SpdxCreationInfo.kt
@@ -57,5 +57,9 @@ data class SpdxCreationInfo(
 ) {
     init {
         require(creators.isNotEmpty()) { "Creators must contain at least one entry, but was empty." }
+
+        require(licenseListVersion.isEmpty() || licenseListVersion.split('.').size == 2) {
+            "The license list version must contain exactly the major and minor parts."
+        }
     }
 }