From 78541d5837ebcd67fbda354b082c238deef00dca Mon Sep 17 00:00:00 2001
From: Wladimir Safonov <wladimir.safonov@itemis.de>
Date: Mon, 14 Apr 2025 11:26:27 +0200
Subject: [PATCH 1/2] updated sbom.json path in the published languages zip

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index be3da47155..eff0366f23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ def minor = "2"
 
 ext.mpsVersion = '2023.2.2'
 
-def mbeddrVersion = "2023.2+"
+def mbeddrVersion = "$major.$minor+"
 def mpsQAVersion = "$major.$minor+"
 
 // if building a against a special branch from mbeddr is required add the name here
@@ -374,6 +374,7 @@ task packageLanguages(type: Zip, dependsOn: [buildLanguages, cyclonedxBom]) {
     }
     from(reportsDir) {
         include 'sbom.json'
+        into 'org.iets3.opensource'
     }
 }
 

From 6ebafc63165e92bdb57ff4b01a8f07ac6d2a0779 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Mon, 14 Apr 2025 13:45:54 +0200
Subject: [PATCH 2/2] Backporting 17f13da

---
 .../models/plugin.mps                         |   2 +
 .../models/org/iets3/core/plugin/plugin.mps   |   2 +
 .../models/org/iets3/req/plugin/plugin.mps    |   2 +
 .../models/plugin.mps                         | 116 ++++++++++++++++++
 ....iets3.core.expr.tracing.plugin.plugin.mps |   2 +
 5 files changed, 124 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
index b6238fbe20..d7784cf047 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
@@ -58,6 +58,7 @@
         <child id="1207145494930" name="expression" index="fuByb" />
       </concept>
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="6461604478897396236" name="updateInBackground" index="22ra45" />
         <property id="1204991940915" name="caption" index="2f7twF" />
         <property id="1205160812895" name="mnemonic" index="2pbE17" />
         <property id="1213283637680" name="isPopup" index="1XlLyE" />
@@ -6397,6 +6398,7 @@
     <property role="1XlLyE" value="true" />
     <property role="2f7twF" value="Interpreter Test Coverage" />
     <property role="2pbE17" value="C" />
+    <property role="22ra45" value="true" />
     <node concept="tT9cl" id="2udM7u8XBv_" role="2f5YQi">
       <ref role="tU$_T" to="tprs:hyf4LYI" resolve="Tools" />
       <ref role="2f8Tey" to="tprs:1TFxXPONz$p" resolve="devkitTools" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
index 09d314b9b8..535096dd77 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
@@ -57,6 +57,7 @@
       </concept>
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="6461604478897396236" name="updateInBackground" index="22ra45" />
         <child id="1204991552650" name="modifier" index="2f5YQi" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
@@ -580,6 +581,7 @@
   <node concept="tC5Ba" id="5E4c7udmbM7">
     <property role="TrG5h" value="ManuallyTriggeredAnalysesGroup" />
     <property role="3GE5qa" value="view" />
+    <property role="22ra45" value="true" />
     <node concept="ftmFs" id="5E4c7udmbMi" role="ftER_">
       <node concept="2a7GMi" id="5E4c7udGMbs" role="ftvYc" />
       <node concept="tCFHf" id="31wEG_giRHQ" role="ftvYc">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
index 864936c33e..3c86e4e4b5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
@@ -60,6 +60,7 @@
       <concept id="1203082903663" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_AnActionEvent" flags="nn" index="tl45R" />
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="6461604478897396236" name="updateInBackground" index="22ra45" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
       <concept id="1203088046679" name="jetbrains.mps.lang.plugin.structure.ActionInstance" flags="ng" index="tCFHf">
@@ -1950,6 +1951,7 @@
   <node concept="tC5Ba" id="1ognOHj$4ol">
     <property role="TrG5h" value="reqActions" />
     <property role="3GE5qa" value="actions" />
+    <property role="22ra45" value="true" />
     <node concept="ftmFs" id="1ognOHj$4p0" role="ftER_">
       <node concept="tCFHf" id="6LfBX8Yg6GI" role="ftvYc">
         <ref role="tCJdB" node="6LfBX8Yg60R" resolve="DeleteRequirement" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index f09c73fdfb..6a48b2b3bf 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -68,6 +68,7 @@
       </concept>
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="6461604478897396236" name="updateInBackground" index="22ra45" />
         <child id="1204991552650" name="modifier" index="2f5YQi" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
@@ -1317,6 +1318,7 @@
   <node concept="tC5Ba" id="2ufoZQISzNZ">
     <property role="3GE5qa" value="inspect" />
     <property role="TrG5h" value="valueInspector" />
+    <property role="22ra45" value="true" />
     <node concept="ftmFs" id="2ufoZQISzOa" role="ftER_">
       <node concept="2a7GMi" id="2ufoZQISzP1" role="ftvYc" />
       <node concept="tCFHf" id="2ufoZQISzOe" role="ftvYc">
@@ -1510,6 +1512,7 @@
   <node concept="tC5Ba" id="XC2si3iCtF">
     <property role="3GE5qa" value="testExecution" />
     <property role="TrG5h" value="TestExecution" />
+    <property role="22ra45" value="true" />
     <node concept="tT9cl" id="XC2si3iC_5" role="2f5YQi">
       <ref role="tU$_T" to="tprs:6gEJNBIezVz" resolve="MPSRunMenu" />
     </node>
@@ -1907,6 +1910,28 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4a2JLGT$tgc" role="jymVt" />
+    <node concept="3clFb_" id="4a2JLGT$skV" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="4a2JLGT$skW" role="1B3o_S" />
+      <node concept="2AHcQZ" id="4a2JLGT$skY" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="4a2JLGT$skZ" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="4a2JLGT$sl2" role="3clF47">
+        <node concept="3clFbF" id="4a2JLGT$ufi" role="3cqZAp">
+          <node concept="Rm8GO" id="4a2JLGT$uB4" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4a2JLGT$sl3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="4ye5wdhZm8Q">
     <property role="3GE5qa" value="testExecution" />
@@ -2213,10 +2238,34 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4a2JLGT$wOf" role="jymVt" />
+    <node concept="3clFb_" id="4a2JLGT$xhx" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="4a2JLGT$xhy" role="1B3o_S" />
+      <node concept="2AHcQZ" id="4a2JLGT$xhz" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="4a2JLGT$xh$" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="4a2JLGT$xh_" role="3clF47">
+        <node concept="3clFbF" id="4a2JLGT$xhA" role="3cqZAp">
+          <node concept="Rm8GO" id="4a2JLGT$xhB" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4a2JLGT$xhC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4a2JLGT$wOg" role="jymVt" />
   </node>
   <node concept="tC5Ba" id="3TIaSh$E6vz">
     <property role="3GE5qa" value="cov" />
     <property role="TrG5h" value="coverageGroup" />
+    <property role="22ra45" value="true" />
     <node concept="ftmFs" id="3TIaSh$E6vC" role="ftER_">
       <node concept="2a7GMi" id="3TIaSh$E6vG" role="ftvYc" />
       <node concept="tCFHf" id="3TIaSh$E6vO" role="ftvYc">
@@ -2581,6 +2630,29 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4a2JLGT$vqk" role="jymVt" />
+    <node concept="3clFb_" id="4a2JLGT$vNh" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="4a2JLGT$vNi" role="1B3o_S" />
+      <node concept="2AHcQZ" id="4a2JLGT$vNj" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="4a2JLGT$vNk" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="4a2JLGT$vNl" role="3clF47">
+        <node concept="3clFbF" id="4a2JLGT$vNm" role="3cqZAp">
+          <node concept="Rm8GO" id="4a2JLGT$vNn" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4a2JLGT$vNo" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4a2JLGT$vIE" role="jymVt" />
   </node>
   <node concept="312cEu" id="5rUl2R7JYML">
     <property role="3GE5qa" value="testExecution" />
@@ -2820,6 +2892,28 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4a2JLGT$ya8" role="jymVt" />
+    <node concept="3clFb_" id="4a2JLGT$yuv" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="4a2JLGT$yuw" role="1B3o_S" />
+      <node concept="2AHcQZ" id="4a2JLGT$yux" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="4a2JLGT$yuy" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="4a2JLGT$yuz" role="3clF47">
+        <node concept="3clFbF" id="4a2JLGT$yu$" role="3cqZAp">
+          <node concept="Rm8GO" id="4a2JLGT$yu_" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4a2JLGT$yuA" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5rUl2R7NKQt">
     <property role="3GE5qa" value="testExecution" />
@@ -2911,6 +3005,28 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4a2JLGT$z8t" role="jymVt" />
+    <node concept="3clFb_" id="4a2JLGT$zcS" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="4a2JLGT$zcT" role="1B3o_S" />
+      <node concept="2AHcQZ" id="4a2JLGT$zcU" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="4a2JLGT$zcV" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="4a2JLGT$zcW" role="3clF47">
+        <node concept="3clFbF" id="4a2JLGT$zcX" role="3cqZAp">
+          <node concept="Rm8GO" id="4a2JLGT$zcY" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4a2JLGT$zcZ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5rUl2R7OncF">
     <property role="3GE5qa" value="testExecution" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps
index 777fc06e24..9d9265b998 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps
@@ -114,6 +114,7 @@
       <concept id="1203082903663" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_AnActionEvent" flags="nn" index="tl45R" />
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="6461604478897396236" name="updateInBackground" index="22ra45" />
         <child id="1204991552650" name="modifier" index="2f5YQi" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
@@ -4541,6 +4542,7 @@
   <node concept="tC5Ba" id="4fb2DFBg_F1">
     <property role="TrG5h" value="showTracerGroup" />
     <property role="3GE5qa" value="actions" />
+    <property role="22ra45" value="true" />
     <node concept="ftmFs" id="4fb2DFBg_F3" role="ftER_">
       <node concept="2a7GMi" id="4fb2DFBg_F6" role="ftvYc" />
       <node concept="tCFHf" id="4fb2DFBg_Fb" role="ftvYc">