Skip to content

Merge maintenance/mps20241 into maintenance/mps20251 #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arimer merged 6 commits into from
Mar 12, 2026
Merged

Merge maintenance/mps20241 into maintenance/mps20251 #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1287a7
chore(deps): update plugin cyclonedxbom to v3
renovate[bot] Mar 12, 2026
a550290
build: migrate cyclonedxBom to 3.2.1
arimer Mar 12, 2026
6eb52eb
build: packageLanguages should depend on cyclonedxDirectBom
arimer Mar 12, 2026
ce2ab8e
Merge branch 'maintenance/mps20241' into renovate/maintenance/mps2024…
arimer Mar 12, 2026
f460399
Merge pull request #1682 from IETS3/renovate/maintenance/mps20241-org…
arimer Mar 12, 2026
914d7a8
Merge branch 'maintenance/mps20251' into merge/mps20241
arimer Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**")
}
Expand Down Expand Up @@ -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)))
}
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.+" }
Expand Down