diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7aa29ae6d3fd..d675ce820c85b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ asciidoctorjPdf = "2.3.9" clikt = "4.2.0" commonsCompress = "1.24.0" cvssCalculator = "1.4.2" -cyclonedx = "7.3.2" +cyclonedx = "8.0.0" diffUtils = "4.12" diskLruCache = "2.0.2" exposed = "0.44.0" diff --git a/plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt b/plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt index 808b03654afe0..29ecd160bc381 100644 --- a/plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt +++ b/plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt @@ -36,7 +36,7 @@ import org.cyclonedx.model.Hash import org.cyclonedx.model.License import org.cyclonedx.model.LicenseChoice import org.cyclonedx.model.Metadata -import org.cyclonedx.model.Tool +import org.cyclonedx.model.metadata.ToolInformation import org.ossreviewtoolkit.model.FileFormat import org.ossreviewtoolkit.model.LicenseSource @@ -155,12 +155,15 @@ class CycloneDxReporter : Reporter { val metadata = Metadata().apply { timestamp = Date() - tools = listOf( - Tool().apply { - name = ORT_FULL_NAME - version = Environment.ORT_VERSION - } - ) + toolChoice = ToolInformation().apply { + components = listOf( + Component().apply { + type = Component.Type.APPLICATION + name = ORT_FULL_NAME + version = Environment.ORT_VERSION + } + ) + } licenseChoice = LicenseChoice().apply { expression = dataLicense } }