Merge pull request #334 from mbeddr/bugfix/sbom_publication

wsafonov · web-flow · commit 24abe876436f · 2025-04-14T11:30:39.000+02:00
Update sbom.json publication
diff --git a/build.gradle b/build.gradle
@@ -318,6 +318,7 @@ task package_mpsqa(type: Zip, dependsOn: [build_allInOne_package, cyclonedxBom])
     }
     from(reportsDir) {
         include 'sbom.json'
+        into 'org.mpsqa.allInOne'
     }
 }
 
@@ -349,7 +350,6 @@ cyclonedxBom {
     outputName = "sbom"
     outputFormat = "json"
     includeLicenseText = false
-    schemaVersion = "1.5"
     includeConfigs = ["plantuml","baseLib","treemap","jacoco"]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ task package_mpsqa(type: Zip, dependsOn: [build_allInOne_package, cyclonedxBom])`
`318`	`318`	`}`
`319`	`319`	`from(reportsDir) {`
`320`	`320`	`include 'sbom.json'`
	`321`	`+ into 'org.mpsqa.allInOne'`
`321`	`322`	`}`
`322`	`323`	`}`
`323`	`324`
`@@ -349,7 +350,6 @@ cyclonedxBom {`
`349`	`350`	`outputName = "sbom"`
`350`	`351`	`outputFormat = "json"`
`351`	`352`	`includeLicenseText = false`
`352`		`- schemaVersion = "1.5"`
`353`	`353`	`includeConfigs = ["plantuml","baseLib","treemap","jacoco"]`
`354`	`354`	`}`
`355`	`355`