Merge pull request #1695 from IETS3/merge/mps20241

Merge maintenance/mps20241 into maintenance/mps20251

Author: arimer

build.gradle.kts

@@ -294,7 +294,7 @@ val checkmodels by tasks.registering(MpsCheck::class) {
 }
 
 val packageLanguages by tasks.registering(Zip::class) {
-    dependsOn(buildLanguages, tasks.cyclonedxBom)
+    dependsOn(buildLanguages, tasks.cyclonedxDirectBom)
     from(artifactsDir) {
         include("org.iets3.opensource/**")
     }
@@ -532,15 +532,10 @@ tasks.githubRelease {
     dependsOn(packageDistroWithDependencies)
 }
 
-tasks.cyclonedxBom {
-    // SBOM destination directory
-    destination.set(reportsDir.asFile)
-    // The file name for the generated SBOMs (before the file format suffix)
-    outputName.set("sbom")
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat.set("json")
-    // Don't include license texts in generated SBOMs
+tasks.cyclonedxDirectBom {
+    jsonOutput.set(reportsDir.file("sbom.json"))
+    // will not generate .xml
+    xmlOutput.unsetConvention()
     includeLicenseText.set(false)
-    // Included bundled runtime dependencies
-    includeConfigs.set(bundledDependencies.map { it.name } + languageLibs.name + mps.name)
+    includeConfigs.set(bundledDependencies.map { it.name }.union(listOf(languageLibs.name, mps.name)))
 }

gradle/libs.versions.toml

@@ -24,7 +24,7 @@ cpSuite = { group = "io.takari.junit", name = "takari-cpsuite", version = "1.2.7
 [bundles]
 
 [plugins]
-cyclonedxBom = { id = "org.cyclonedx.bom", version = "2.2.0" }
+cyclonedxBom = { id = "org.cyclonedx.bom", version = "3.2.1" }
 downloadJbr = { id = "download-jbr", version = "1.29.3.+" }
 githubRelease = { id = "com.github.breadmoirai.github-release", version = "2.4.1" }
 mpsCommon = { id = "de.itemis.mps.gradle.common", version = "1.29.+" }