diff --git a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json index e5b3ca98735c9..0225e999e6355 100644 --- a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json +++ b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json @@ -4,7 +4,7 @@ "creationInfo" : { "comment" : "some creation info comment", "created" : "", - "creators" : [ "Tool: OSS Review Toolkit - " ], + "creators" : [ "Tool: ort-" ], "licenseListVersion" : "" }, "name" : "some document name", diff --git a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml index 625a00fbe11cb..eec9cdc98b5fb 100644 --- a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml +++ b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml @@ -5,7 +5,7 @@ creationInfo: comment: "some creation info comment" created: "" creators: - - "Tool: OSS Review Toolkit - " + - "Tool: ort-" licenseListVersion: "" name: "some document name" dataLicense: "CC0-1.0" diff --git a/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt b/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt index 296c1f9baa689..b01d0de2a9e86 100644 --- a/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt +++ b/plugins/reporters/spdx/src/main/kotlin/SpdxDocumentModelMapper.kt @@ -32,7 +32,7 @@ import org.ossreviewtoolkit.model.SourceCodeOrigin.VCS import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver import org.ossreviewtoolkit.reporter.LicenseTextProvider import org.ossreviewtoolkit.utils.ort.Environment -import org.ossreviewtoolkit.utils.ort.ORT_FULL_NAME +import org.ossreviewtoolkit.utils.ort.ORT_NAME import org.ossreviewtoolkit.utils.spdx.SpdxConstants import org.ossreviewtoolkit.utils.spdx.SpdxLicense import org.ossreviewtoolkit.utils.spdx.model.SpdxCreationInfo @@ -157,7 +157,7 @@ internal object SpdxDocumentModelMapper : Logging { creationInfo = SpdxCreationInfo( comment = params.creationInfoComment, created = Instant.now().truncatedTo(ChronoUnit.SECONDS), - creators = listOf("${SpdxConstants.TOOL} $ORT_FULL_NAME - ${Environment.ORT_VERSION}"), + creators = listOf("${SpdxConstants.TOOL} $ORT_NAME-${Environment.ORT_VERSION}"), licenseListVersion = SpdxLicense.LICENSE_LIST_VERSION.substringBefore("-") ), documentNamespace = "spdx://${UUID.randomUUID()}",