Merge master into merge/mps20251

Author: github-actions[bot]

.github/workflows/vulnerability-scanning.yml

@@ -13,11 +13,11 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4
       - 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

README.md

@@ -26,6 +26,7 @@ For details, see the [wiki](https://github.com/IETS3/iets3.opensource/wiki/Suppo
 | MPS version | Nexus | branch |
 | --------------- | --------------- | --------------- |
 | Master | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [master](https://github.com/IETS3/iets3.opensource/tree/master) |
+| 2025.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2025.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) |
 | 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2024.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) |
 | 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) |
 | 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) |

build.gradle

@@ -11,9 +11,9 @@ plugins {
     id 'base'
     id 'maven-publish'
     id 'de.itemis.mps.gradle.common' version '1.29.+'
-    id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
+    id 'de.itemis.mps.gradle.launcher' version '2.6.1.+'
     id "com.github.breadmoirai.github-release" version "2.4.1"
-    id "org.cyclonedx.bom" version "2.2.0"
+    id "org.cyclonedx.bom" version "2.3.1"
 }
 
 repositories {
@@ -41,16 +41,17 @@ if (project.hasProperty("forceCI")) {
 
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
-def major = '2025'
-def minor = '1'
-def bugfix = ''
+def major = "9999"
+def minor = "9"
 
 // Dependency versions
 
-ext.mpsVersion = "$major.$minor" + (bugfix ? ".$bugfix" : '')
 
+
+ext.mpsVersion = "252.18003.155"
 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
 // be used here. No need to convert "/" the script will take care of that.
@@ -118,8 +119,10 @@ configurations {
 }
 
 dependencies {
-    mps "com.jetbrains:mps:$mpsVersion"
-    rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.2.0.+")
+    // 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.3.0.+")
     languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
     languageLibs "com.mbeddr:platform:$mbeddrVersion"
     junitAnt 'org.apache.ant:ant-junit:1.10.15'

code/languages/org.iets3.opensource/.mps/migration.xml

@@ -25,6 +25,6 @@
     <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="251" />
+    <entry key="project.migrated.version" value="252" />
   </component>
 </project>

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps

@@ -86,7 +86,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>

code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps

@@ -138,7 +138,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>

code/languages/org.iets3.opensource/languages/org.iets3.components.functional/models/intentions.mps

@@ -81,7 +81,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>

code/languages/org.iets3.opensource/languages/org.iets3.components.toplevel.adapter/models/intentions.mps

@@ -65,7 +65,7 @@
       </concept>
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>

code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps

@@ -65,7 +65,7 @@
       </concept>
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/intentions.mps

@@ -64,7 +64,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
-      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.SectionAnnotation" flags="ng" index="1SWQZ3">
+      <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.GroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
     </language>