deps: Update cyclonedx-core-java to version 8.0.0

This deprecates the `Tool` class in favor of `ToolInformation`, see [1]. [1]: CycloneDX/cyclonedx-core-java#316
oss-review-toolkit · Oct 4, 2023 · 9dd231f · 9dd231f
1 parent 3207d1e
commit 9dd231f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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 }
         }