Merge branch 'master' into renovate/com.github.breadmoirai.github-release-2.x

Author: arimer

.github/workflows/vulnerability-scanning.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           distribution: temurin
           java-version: 17
@@ -17,7 +17,7 @@ jobs:
       - name: Call setup
         run: ./gradlew dependencies
       - name: Dependency Check
-        uses: dependency-check/Dependency-Check_Action@3102a65fd5f36d0000297576acc56a475b0de98d
+        uses: dependency-check/Dependency-Check_Action@2ba636726705b0f74f126ebeaacaf2ad4600b967
         env:
           # actions/setup-java changes JAVA_HOME, so it needs to be reset to match the depcheck image
           JAVA_HOME: /opt/jdk

CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## June 2025
+
+### Changed
+
+- Published SBOM contains dependencies only from runtime configurations
+
+## May 2025
+
+### Changed
+
+- The language org.iets3.variability.artifacts.base was temporarily renamed to org.iets3.variability.artifacts.vanguard.
+
+### Fixed
+
+- Plugin org.iets3.safety was renamed to org.iets3.safety.os fixing the name collision with a plugin in org.iets3.core 
+
+- A NullPointerException was fixed for cases where a node implementing IValidNamedConcept had no name.
+- When calculating the supertype of number types, the precision is now correctly set to infinite when one of the types has an infinite precision.
+- The primitiveTypeMapper extension supports a new method `PrimitiveTypeMapper#useStringConstraints` that can be set to false to disable string types with constraints and go back to regular string types.
+
 ## April 2025
 
 ### Fixed

README.md

@@ -1,7 +1,7 @@
 import de.itemis.mps.gradle.*
-import de.itemis.mps.gradle.tasks.MpsMigrate
-import de.itemis.mps.gradle.tasks.Remigrate
+import de.itemis.mps.gradle.tasks.*
 import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
+import groovy.transform.TupleConstructor
 import groovy.xml.XmlSlurper
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
@@ -13,7 +13,7 @@ plugins {
     id 'de.itemis.mps.gradle.common' version '1.29.+'
     id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
     id "com.github.breadmoirai.github-release" version "2.5.2"
-    id "org.cyclonedx.bom" version "1.8.2"
+    id "org.cyclonedx.bom" version "2.2.0"
 }
 
 repositories {
@@ -26,9 +26,9 @@ repositories {
 
 apply plugin: 'download-jbr'
 
-// configure jbr download
+// configure jbr download version
 downloadJbr {
-    jbrVersion = '17.0.11-b1207.30'
+    jbrVersion = '21.0.6-b895.109'
 }
 
 // detect if we are in a CI build
@@ -41,13 +41,16 @@ if (project.hasProperty("forceCI")) {
 
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
-def major = "2024"
-def minor = "1"
+def major = "9999"
+def minor = "9"
 
 // Dependency versions
 
-ext.mpsVersion = '2024.1.2'
-ext.mpsQAVersion = "2024.1.1022.300f07a"
+
+
+ext.mpsVersion = "251.25410.10228"
+def mpsQAVersion = "$major.$minor+"
+
 
 // if building a against a special branch from mbeddr is required add the name here
 // the name is enough no trailing "." is required, also the plain name from git can
@@ -57,9 +60,9 @@ def currentBranch = ""
 
 if (!project.hasProperty('mbeddrVersion')) {
     if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
-        ext.mbeddrVersion = "${mbeddrBranch.replace("/", "-")}.${major}.${minor}.+"
+        ext.mbeddrVersion = "${mbeddrBranch.replace("/", "-")}.$major.$minor+"
     } else {
-        ext.mbeddrVersion = "2024.1.25305.dff1a9a"
+        ext.mbeddrVersion = "$major.$minor+"
     }
 }
 
@@ -95,27 +98,90 @@ ext.snapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-sn
 ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
 
 
+def buildDirPath(pathUnderBuildDir) {
+    project.layout.buildDirectory.dir(pathUnderBuildDir).get().asFile
+}
 
 // 'artifacts' is used in the generated ant scripts as build output directory
-ext.artifactsDir = new File(buildDir, 'artifacts')
+ext.artifactsDir = buildDirPath('artifacts')
+ext.reportsDir = buildDirPath('reports')
+
+wrapper {
+    gradleVersion '8.13'
+    distributionType Wrapper.DistributionType.ALL
+}
 
 configurations {
     mps
     rerunMigrationsBackend
     languageLibs
     junitAnt
-    pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
-    bigMath // Synced to org.iets3.core.expr.math.interpreter/lib
 }
 
 dependencies {
-    mps "com.jetbrains:mps:$mpsVersion"
+    // For a release version of MPS, use this dependency:
+    //mps "com.jetbrains:mps:$mpsBuild"
+    mps "com.jetbrains.mps:mps-prerelease:$mpsVersion"
     rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.2.0.+")
     languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
     languageLibs "com.mbeddr:platform:$mbeddrVersion"
     junitAnt 'org.apache.ant:ant-junit:1.10.15'
-    pcollections 'org.pcollections:pcollections:4.0.2'
-    bigMath 'ch.obermuhlner:big-math:2.3.2'
+}
+
+@TupleConstructor
+class BundledDep {
+    String name
+    List<String> entries
+    String libSolutionName
+    Closure configClosure = { transitive = false }
+    // in case a legacy dependency has a broken artifact name, e.g. w/o extension
+    String jarNameOverride
+    String getConfigName() {
+        name + '_bundled'
+    }
+    String getResolveTaskName() {
+        'resolve_' + this.configName
+    }
+    BundledDep overrideArtifactName(String artifactName) {
+        this.jarNameOverride = artifactName
+        this
+    }
+}
+
+def bundledDeps = [
+        new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.2'], 'org.iets3.core.expr.base.collections.stubs'),
+        new BundledDep('bigMath', ['ch.obermuhlner:big-math:2.3.2'], 'org.iets3.core.expr.math.interpreter'),
+        new BundledDep('functionalJava', ['org.functionaljava:functionaljava:5.0'], 'org.iets3.core.expr.genjava.functionalJava'),
+        new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7'], 'org.iets3.opensource.build.gentests.rt').overrideArtifactName('takari-cpsuite.jar')
+]
+
+bundledDeps.each { dep ->
+    configurations {
+        create(dep.configName)
+    }
+    dependencies {
+        dep.entries.each {entry ->
+            add(dep.configName, entry, dep.configClosure)
+        }
+    }
+    tasks.create(dep.resolveTaskName, Sync.class) {
+        from configurations.getByName(dep.configName)
+        into file("code/languages/org.iets3.opensource/solutions/${dep.libSolutionName}/lib")
+
+        // Strip version numbers from file names
+        rename { filename ->
+            def ra = configurations.getByName(dep.configName).resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
+            String finalName
+            if (dep.jarNameOverride != null) {
+                finalName = dep.jarNameOverride
+            } else if (ra.classifier != null) {
+                finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
+            } else {
+                finalName = "${ra.name}.${ra.extension}"
+            }
+            return finalName
+        }
+    }
 }
 
 
@@ -134,41 +200,8 @@ task resolveLanguageLibs(type: Sync) {
     into "$buildDir/dependencies"
 }
 
-task resolvePcollections(type: Sync) {
-    from configurations.pcollections
-    into file('code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/lib')
-
-    // Strip version numbers from file names
-    rename { filename ->
-        def ra = configurations.pcollections.resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
-        String finalName
-        if (ra.classifier != null) {
-            finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
-        } else {
-            finalName = "${ra.name}.${ra.extension}"
-        }
-        return finalName
-    }
-}
-
-task resolveBigMath(type: Sync) {
-    from configurations.bigMath
-    into file('code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/lib')
-
-    // Strip version numbers from file names
-    rename { filename ->
-        def ra = configurations.bigMath.resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
-        String finalName
-        if (ra.classifier != null) {
-            finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
-        } else {
-            finalName = "${ra.name}.${ra.extension}"
-        }
-        return finalName
-    }
-}
-
-task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections, resolveBigMath])
+task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs])
+resolveDependencies.dependsOn << bundledDeps.collect {it.resolveTaskName }
 
 ext.mpsHomeDir = resolveMps.destinationDir
 
@@ -256,11 +289,11 @@ buildAndRunTests.configure { finalizedBy failOnTestError }
 check.dependsOn buildAndRunTests
 
 tasks.register('migrate', MpsMigrate) {
-    dependsOn(resolveMps, 'resolveMpsForModelcheck', 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
+    dependsOn(resolveMps, 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
     javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
 
     haltOnPrecheckFailure = false
-    haltOnDependencyError = true
+    haltOnDependencyError = false
 
     mpsHome = mpsHomeDir
 
@@ -276,7 +309,7 @@ tasks.register('remigrate', Remigrate) {
     mustRunAfter('migrate')
     mustRunAfter('buildLanguages', 'buildAndRunTests')
 
-    dependsOn(resolveMps, 'resolveMpsForModelcheck','downloadJbr')
+    dependsOn(resolveMps,'downloadJbr')
 
     javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
 
@@ -288,26 +321,22 @@ tasks.register('remigrate', Remigrate) {
     maxHeapSize = '4G'
 }
 
-apply plugin: 'modelcheck'
-
 File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
 
-def pluginsList = []
+tasks.register('checkmodels', MpsCheck) {
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
 
-modelcheck {
     projectLocation = new File("$projectDir/code/languages/org.iets3.opensource")
-    mpsLocation = new File("$buildDir/mps")
-    plugins = pluginsList
-    mpsConfig = configurations.mps
-    macros = [new Macro("iets3.github.opensource.home", "$projectDir")]
+    mpsHome = new File("$buildDir/mps")
+    pluginRoots.add(mpsHome.dir('plugins'))
+    folderMacros.put("iets3.github.opensource.home", layout.projectDirectory)
     junitFile = modelcheckresult
     junitFormat = "message"
-    errorNoFail = true
+    ignoreFailures = true
     debug = false
-    maxHeap = "4G"
+    maxHeapSize = "4G"
 }
 
-
 afterEvaluate {  project ->
     /*
     check.configure {
@@ -317,14 +346,15 @@ afterEvaluate {  project ->
 }
 
 
-checkmodels {
-    dependsOn(resolveMps)
-}
-
-task packageLanguages(type: Zip, dependsOn: buildLanguages) {
+task packageLanguages(type: Zip, dependsOn: [buildLanguages, cyclonedxBom]) {
     archiveBaseName = 'org.iets3.opensource'
-    from artifactsDir
-    include 'org.iets3.opensource/**'
+    from(artifactsDir) {
+        include 'org.iets3.opensource/**'
+    }
+    from(reportsDir) {
+        include 'sbom.json'
+        into 'org.iets3.opensource'
+    }
 }
 
 task packageTests(type: Zip, dependsOn: buildAndRunTests) {
@@ -542,15 +572,15 @@ tasks.named('githubRelease').configure {
 
 cyclonedxBom {
     // SBOM destination directory
-    destination = file("build/reports")
+    destination = reportsDir
     // The file name for the generated SBOMs (before the file format suffix)
     outputName = "sbom"
     // The file format generated, can be xml, json or all for generating both
     outputFormat = "json"
     // Don't include license texts in generated SBOMs
     includeLicenseText = false
-}
-
-assemble {
-    dependsOn('cyclonedxBom')
+    // Include runtime only deps (bundled libs, language libs, mps)
+    def runtimeConfigs = bundledDeps.collect {it.configName }
+    runtimeConfigs.addAll([configurations.mps.name, configurations.languageLibs.name])
+    includeConfigs = runtimeConfigs
 }

build.gradle

@@ -126,8 +126,10 @@
       <settings refid="m2m-0" />
       <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" id="com.mbeddr.platform.build" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" id="de.itemis.mps.extensions.build" />
+      <plugin path="${artifacts.mps}/lib/mps-workbench.jar" id="com.intellij.modules.mps" />
       <plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
       <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
+      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
       <chunk>
         <module file="${iets3.lang.opensource}/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl" />
         <module file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd" />
@@ -162,7 +164,7 @@
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
         <pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
-        <fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
+        <fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
       </classpath>
@@ -324,7 +326,7 @@
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
+        <fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite.jar" />
         <fileset file="${artifacts.mps}/lib/junit4.jar" />
       </classpath>
     </javac>

build/scripts/build-allScripts.xml

@@ -22,8 +22,9 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="241" />
+    <entry key="project.migrated.version" value="251" />
   </component>
 </project>