From 8617dc3f6bc9b42bc06d26d8d4596a59239d569a Mon Sep 17 00:00:00 2001 From: ahmed-ali-55 Date: Fri, 24 Nov 2023 15:38:11 +0100 Subject: [PATCH] [CID-2087] Removing CycloneDx=schema.version from ort report params and upgrading cyclonedx-core-java to 8.0.3 --- build.gradle.kts | 2 +- .../kotlin/net/leanix/vsm/sbomBooster/service/OrtService.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d705de1..8ebef37 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.reactivestreams:reactive-streams:1.0.4") implementation("com.expediagroup:graphql-kotlin-spring-client:6.2.2") - implementation("org.cyclonedx:cyclonedx-core-java:7.2.0") + implementation("org.cyclonedx:cyclonedx-core-java:8.0.3") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("com.ninja-squad:springmockk:4.0.2"){ exclude(module = "mockito-core") diff --git a/src/main/kotlin/net/leanix/vsm/sbomBooster/service/OrtService.kt b/src/main/kotlin/net/leanix/vsm/sbomBooster/service/OrtService.kt index b98483b..380001f 100644 --- a/src/main/kotlin/net/leanix/vsm/sbomBooster/service/OrtService.kt +++ b/src/main/kotlin/net/leanix/vsm/sbomBooster/service/OrtService.kt @@ -115,8 +115,7 @@ class OrtService( "-f", "CycloneDX", "-i", "/project/${projectUrl.substringAfterLast("/")}_ORT_produced_files/analyzer-result.yml", "-o", "/project/${projectUrl.substringAfterLast("/")}_ORT_produced_files", - "-O", "CycloneDx=output.file.formats=json", - "-O", "CycloneDx=schema.version=1.4" + "-O", "CycloneDx=output.file.formats=json" ) addOrtArgs(args, ortArgs)