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

# Conflicts:
#	build.gradle

Author: arimer

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.5.2"
-    id "org.cyclonedx.bom" version "2.2.0"
+    id "org.cyclonedx.bom" version "2.3.1"
 }
 
 repositories {
@@ -48,7 +48,7 @@ def minor = "9"
 
 
 
-ext.mpsVersion = "251.25410.10228"
+ext.mpsVersion = "252.18003.90"
 def mpsQAVersion = "$major.$minor+"
 
 

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/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps

@@ -12,9 +12,7 @@
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="eaz0" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:javax.xml.bind(MPS.ThirdParty/)" />
     <import index="h0j0" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.xml.namespace(JDK/)" />
-    <import index="m3wx" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:javax.xml.bind.annotation(MPS.ThirdParty/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
@@ -30,6 +28,8 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="d6jk" ref="r:52c49891-65a1-45a5-a86b-4a7aa1e6c12e(org.iets3.core.junit.interpreter.run.configuration.plugin)" />
     <import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" />
+    <import index="eaz0" ref="72acac8d-4dd3-4bac-a8ea-ee97162c24e8/java:javax.xml.bind(JAXB/)" />
+    <import index="m3wx" ref="72acac8d-4dd3-4bac-a8ea-ee97162c24e8/java:javax.xml.bind.annotation(JAXB/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1988,9 +1988,9 @@
       <ref role="2AI5Lk" to="m3wx:~XmlAccessorType" resolve="XmlAccessorType" />
       <node concept="2B6LJw" id="5ZZgOa8J67d" role="2B76xF">
         <ref role="2B6OnR" to="m3wx:~XmlAccessorType.value()" resolve="value" />
-        <node concept="Rm8GO" id="5ZZgOa8J7LK" role="2B70Vg">
-          <ref role="1Px2BO" to="m3wx:~XmlAccessType" resolve="XmlAccessType" />
+        <node concept="Rm8GO" id="bwlmYfXKrh" role="2B70Vg">
           <ref role="Rm8GQ" to="m3wx:~XmlAccessType.FIELD" resolve="FIELD" />
+          <ref role="1Px2BO" to="m3wx:~XmlAccessType" resolve="XmlAccessType" />
         </node>
       </node>
     </node>

code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd

@@ -28,9 +28,9 @@
     <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">33f214de-6dce-4396-83c7-640823b7c525(jetbrains.mps.baselanguage.unitTest.launcher)</dependency>
-    <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)</dependency>
+    <dependency reexport="false">72acac8d-4dd3-4bac-a8ea-ee97162c24e8(JAXB)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -58,6 +58,7 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="72acac8d-4dd3-4bac-a8ea-ee97162c24e8(JAXB)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
@@ -66,7 +67,6 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
     <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="68e30703-3df8-4f84-a3eb-772b21d7fc85(TempModule68e30703-3df8-4f84-a3eb-772b21d7fc85)" version="0" />
     <module reference="97495013-dd3f-4cf4-b0d1-93daf53c9b77(TempModule97495013-dd3f-4cf4-b0d1-93daf53c9b77)" version="0" />

code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

@@ -1515,16 +1515,16 @@
             <ref role="3bR37D" node="3FexrMiSOe$" resolve="org.iets3.core.expr.plugin" />
           </node>
         </node>
-        <node concept="1SiIV0" id="62vWlLjQioO" role="3bR37C">
-          <node concept="3bR9La" id="62vWlLjQioP" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="62vWlLjQioQ" role="3bR37C">
           <node concept="3bR9La" id="62vWlLjQioR" role="1SiIV1">
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
+        <node concept="1SiIV0" id="bwlmYgn$D7" role="3bR37C">
+          <node concept="3bR9La" id="bwlmYgn$D8" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:6U$p2g0pj3R" resolve="JAXB" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="5wLtKNeSWz5" role="3989C9">