Merge maintenance/mps20251 into master

.github/workflows/vulnerability-scanning.yml

@@ -6,14 +6,14 @@ jobs:
     name: depecheck_test
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
       - name: Setup Java
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5
         with:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
       - name: Call setup
         run: ./gradlew dependencies
       - name: Dependency Check

CHANGELOG.md

@@ -5,6 +5,15 @@ 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 2026
+
+### Added
+
+- Variability: For the filtering of 150% models, a new API for `IRenamer` is provided. It allows renaming all clones of an instantiated element in one step. The old API which allows renaming only one-by-one is still available - this is not a breaking change.
+- Variability: Introduced extension point `configCombinationLogicExtPoint` (interface `IConfigCombinationLogic`) to make the logic of combining configurations (via `extends`, `abstract` and referenced sub-configurations) configurable per application.
+- Variability: Configuration checking for referenced abstract sub-configurations now respects the active combination logic, and configuration hashing was extended to cover a configuration together with all configurations reachable from it.
+
+
 ## May 2026
 
 ### Fixed

code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.constraints.mps

@@ -639,25 +639,5 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="3iKj9$PPObE">
-    <property role="3GE5qa" value="configExpr" />
-    <ref role="1M2myG" to="i9mv:4zfp5i3JX6h" resolve="GlobalFeatureModelConfiguration" />
-    <node concept="9S07l" id="3iKj9$PPOdj" role="9Vyp8">
-      <node concept="3clFbS" id="3iKj9$PPOdk" role="2VODD2">
-        <node concept="3clFbF" id="3iKj9$PPOkB" role="3cqZAp">
-          <node concept="3fqX7Q" id="3iKj9$PPOY9" role="3clFbG">
-            <node concept="2OqwBi" id="3iKj9$PPOYb" role="3fr31v">
-              <node concept="nLn13" id="3iKj9$PPOYc" role="2Oq$k0" />
-              <node concept="1mIQ4w" id="3iKj9$PPOYd" role="2OqNvi">
-                <node concept="chp4Y" id="3iKj9$PPOYe" role="cj9EA">
-                  <ref role="cht4Q" to="rmn3:3tsFshP56tQ" resolve="VariabilityModelChunk" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 

code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.migration.mps

@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
   <imports />

code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl

@@ -77,7 +77,6 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
-    <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps

@@ -2509,136 +2509,152 @@
       <node concept="3clFbH" id="3jDeZf7s1IK" role="3cqZAp" />
       <node concept="3clFbJ" id="34IieWHir4o" role="3cqZAp">
         <node concept="3clFbS" id="34IieWHir4p" role="3clFbx">
-          <node concept="3SKdUt" id="4lyl69nsTIJ" role="3cqZAp">
-            <node concept="1PaTwC" id="4lyl69nsTIK" role="1aUNEU">
-              <node concept="3oM_SD" id="4lyl69nsUuP" role="1PaTwD">
-                <property role="3oM_SC" value="If" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUuR" role="1PaTwD">
-                <property role="3oM_SC" value="a" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUv3" role="1PaTwD">
-                <property role="3oM_SC" value="abstract" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUv7" role="1PaTwD">
-                <property role="3oM_SC" value="config" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvc" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvi" role="1PaTwD">
-                <property role="3oM_SC" value="referenced" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvp" role="1PaTwD">
-                <property role="3oM_SC" value="the" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvx" role="1PaTwD">
-                <property role="3oM_SC" value="config" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvE" role="1PaTwD">
-                <property role="3oM_SC" value="itself" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvO" role="1PaTwD">
-                <property role="3oM_SC" value="must" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUvZ" role="1PaTwD">
-                <property role="3oM_SC" value="be" />
-              </node>
-              <node concept="3oM_SD" id="4lyl69nsUwb" role="1PaTwD">
-                <property role="3oM_SC" value="abstract" />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="4lyl69nenjY" role="3cqZAp">
-            <node concept="3cpWsn" id="4lyl69nenjZ" role="3cpWs9">
-              <property role="TrG5h" value="abstractFMI" />
-              <node concept="3Tqbb2" id="4lyl69nenj7" role="1tU5fm">
-                <ref role="ehGHo" to="4ndm:5NPKd17BIPE" resolve="FeatureModelConfigurationRef" />
+          <node concept="3clFbJ" id="6Y8yTZltiwH" role="3cqZAp">
+            <node concept="3clFbS" id="6Y8yTZltiwJ" role="3clFbx">
+              <node concept="3SKdUt" id="4lyl69nsTIJ" role="3cqZAp">
+                <node concept="1PaTwC" id="4lyl69nsTIK" role="1aUNEU">
+                  <node concept="3oM_SD" id="4lyl69nsUuP" role="1PaTwD">
+                    <property role="3oM_SC" value="If" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUuR" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUv3" role="1PaTwD">
+                    <property role="3oM_SC" value="abstract" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUv7" role="1PaTwD">
+                    <property role="3oM_SC" value="config" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvc" role="1PaTwD">
+                    <property role="3oM_SC" value="is" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvi" role="1PaTwD">
+                    <property role="3oM_SC" value="referenced" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvp" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvx" role="1PaTwD">
+                    <property role="3oM_SC" value="config" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvE" role="1PaTwD">
+                    <property role="3oM_SC" value="itself" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvO" role="1PaTwD">
+                    <property role="3oM_SC" value="must" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUvZ" role="1PaTwD">
+                    <property role="3oM_SC" value="be" />
+                  </node>
+                  <node concept="3oM_SD" id="4lyl69nsUwb" role="1PaTwD">
+                    <property role="3oM_SC" value="abstract" />
+                  </node>
+                </node>
               </node>
-              <node concept="2OqwBi" id="4lyl69nenk0" role="33vP2m">
-                <node concept="2OqwBi" id="4lyl69nenk1" role="2Oq$k0">
-                  <node concept="1YBJjd" id="4lyl69nenk2" role="2Oq$k0">
-                    <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
+              <node concept="3cpWs8" id="4lyl69nenjY" role="3cqZAp">
+                <node concept="3cpWsn" id="4lyl69nenjZ" role="3cpWs9">
+                  <property role="TrG5h" value="abstractFMI" />
+                  <node concept="3Tqbb2" id="4lyl69nenj7" role="1tU5fm">
+                    <ref role="ehGHo" to="4ndm:5NPKd17BIPE" resolve="FeatureModelConfigurationRef" />
                   </node>
-                  <node concept="2Rf3mk" id="4lyl69nenk3" role="2OqNvi">
-                    <node concept="1xMEDy" id="4lyl69nenk4" role="1xVPHs">
-                      <node concept="chp4Y" id="4lyl69nenk5" role="ri$Ld">
-                        <ref role="cht4Q" to="4ndm:5NPKd17BIPE" resolve="FeatureModelConfigurationRef" />
+                  <node concept="2OqwBi" id="4lyl69nenk0" role="33vP2m">
+                    <node concept="2OqwBi" id="4lyl69nenk1" role="2Oq$k0">
+                      <node concept="1YBJjd" id="4lyl69nenk2" role="2Oq$k0">
+                        <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
+                      </node>
+                      <node concept="2Rf3mk" id="4lyl69nenk3" role="2OqNvi">
+                        <node concept="1xMEDy" id="4lyl69nenk4" role="1xVPHs">
+                          <node concept="chp4Y" id="4lyl69nenk5" role="ri$Ld">
+                            <ref role="cht4Q" to="4ndm:5NPKd17BIPE" resolve="FeatureModelConfigurationRef" />
+                          </node>
+                        </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="1z4cxt" id="4lyl69nenk6" role="2OqNvi">
-                  <node concept="1bVj0M" id="4lyl69nenk7" role="23t8la">
-                    <node concept="3clFbS" id="4lyl69nenk8" role="1bW5cS">
-                      <node concept="3clFbF" id="4lyl69nenk9" role="3cqZAp">
-                        <node concept="2OqwBi" id="4lyl69nenka" role="3clFbG">
-                          <node concept="2OqwBi" id="4lyl69nenkb" role="2Oq$k0">
-                            <node concept="37vLTw" id="4lyl69nenkc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4lyl69nenkf" resolve="it" />
-                            </node>
-                            <node concept="3TrEf2" id="4lyl69nenkd" role="2OqNvi">
-                              <ref role="3Tt5mk" to="4ndm:5NPKd17BIPF" resolve="config" />
+                    <node concept="1z4cxt" id="4lyl69nenk6" role="2OqNvi">
+                      <node concept="1bVj0M" id="4lyl69nenk7" role="23t8la">
+                        <node concept="3clFbS" id="4lyl69nenk8" role="1bW5cS">
+                          <node concept="3clFbF" id="4lyl69nenk9" role="3cqZAp">
+                            <node concept="2OqwBi" id="4lyl69nenka" role="3clFbG">
+                              <node concept="2OqwBi" id="4lyl69nenkb" role="2Oq$k0">
+                                <node concept="37vLTw" id="4lyl69nenkc" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4lyl69nenkf" resolve="it" />
+                                </node>
+                                <node concept="3TrEf2" id="4lyl69nenkd" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="4ndm:5NPKd17BIPF" resolve="config" />
+                                </node>
+                              </node>
+                              <node concept="3TrcHB" id="4lyl69nenke" role="2OqNvi">
+                                <ref role="3TsBF5" to="4ndm:4onczE5U5c$" resolve="abstract" />
+                              </node>
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="4lyl69nenke" role="2OqNvi">
-                            <ref role="3TsBF5" to="4ndm:4onczE5U5c$" resolve="abstract" />
-                          </node>
+                        </node>
+                        <node concept="gl6BB" id="4lyl69nenkf" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="4lyl69nenkg" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
-                    <node concept="gl6BB" id="4lyl69nenkf" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4lyl69nenkg" role="1tU5fm" />
-                    </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="4lyl69nepEu" role="3cqZAp">
-            <node concept="3clFbS" id="4lyl69nepEw" role="3clFbx">
-              <node concept="2MkqsV" id="4lyl69neqzF" role="3cqZAp">
-                <node concept="3cpWs3" id="4lyl69nerAd" role="2MkJ7o">
-                  <node concept="Xl_RD" id="4lyl69neqzU" role="3uHU7B">
-                    <property role="Xl_RC" value="Needs to be abstract, at least one abstract Feature Model Configuration referenced. " />
-                  </node>
-                  <node concept="2OqwBi" id="4lyl69nerVt" role="3uHU7w">
-                    <node concept="2OqwBi" id="4lyl69nerSi" role="2Oq$k0">
-                      <node concept="37vLTw" id="4lyl69nerAv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4lyl69nenjZ" resolve="abstractFMI" />
+              <node concept="3clFbJ" id="4lyl69nepEu" role="3cqZAp">
+                <node concept="3clFbS" id="4lyl69nepEw" role="3clFbx">
+                  <node concept="2MkqsV" id="4lyl69neqzF" role="3cqZAp">
+                    <node concept="3cpWs3" id="4lyl69nerAd" role="2MkJ7o">
+                      <node concept="Xl_RD" id="4lyl69neqzU" role="3uHU7B">
+                        <property role="Xl_RC" value="Needs to be abstract, at least one abstract Feature Model Configuration referenced. " />
                       </node>
-                      <node concept="3TrEf2" id="4lyl69nerUg" role="2OqNvi">
-                        <ref role="3Tt5mk" to="4ndm:5NPKd17BIPF" resolve="config" />
+                      <node concept="2OqwBi" id="4lyl69nerVt" role="3uHU7w">
+                        <node concept="2OqwBi" id="4lyl69nerSi" role="2Oq$k0">
+                          <node concept="37vLTw" id="4lyl69nerAv" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4lyl69nenjZ" resolve="abstractFMI" />
+                          </node>
+                          <node concept="3TrEf2" id="4lyl69nerUg" role="2OqNvi">
+                            <ref role="3Tt5mk" to="4ndm:5NPKd17BIPF" resolve="config" />
+                          </node>
+                        </node>
+                        <node concept="3TrcHB" id="4lyl69nerYw" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3TrcHB" id="4lyl69nerYw" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    <node concept="1YBJjd" id="4lyl69nesse" role="1urrMF">
+                      <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
+                    </node>
+                    <node concept="3Cnw8n" id="4lyl69nFvRs" role="1urrFz">
+                      <ref role="QpYPw" node="4lyl69nFqBj" resolve="fix_MakeConfigAbstract" />
+                      <node concept="3CnSsL" id="4lyl69nFxst" role="3Coj4f">
+                        <ref role="QkamJ" node="4lyl69nFr3h" resolve="fmc" />
+                        <node concept="1YBJjd" id="4lyl69nFxsE" role="3CoRuB">
+                          <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
+                        </node>
+                      </node>
                     </node>
                   </node>
+                  <node concept="3cpWs6" id="XsXh$lOFMN" role="3cqZAp" />
                 </node>
-                <node concept="1YBJjd" id="4lyl69nesse" role="1urrMF">
-                  <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
-                </node>
-                <node concept="3Cnw8n" id="4lyl69nFvRs" role="1urrFz">
-                  <ref role="QpYPw" node="4lyl69nFqBj" resolve="fix_MakeConfigAbstract" />
-                  <node concept="3CnSsL" id="4lyl69nFxst" role="3Coj4f">
-                    <ref role="QkamJ" node="4lyl69nFr3h" resolve="fmc" />
-                    <node concept="1YBJjd" id="4lyl69nFxsE" role="3CoRuB">
-                      <ref role="1YBMHb" node="4u9Rq0kmn8n" resolve="fmc" />
-                    </node>
+                <node concept="3y3z36" id="4lyl69neqqk" role="3clFbw">
+                  <node concept="10Nm6u" id="4lyl69neqwV" role="3uHU7w" />
+                  <node concept="37vLTw" id="4lyl69neqpO" role="3uHU7B">
+                    <ref role="3cqZAo" node="4lyl69nenjZ" resolve="abstractFMI" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="XsXh$lOFMN" role="3cqZAp" />
             </node>
-            <node concept="3y3z36" id="4lyl69neqqk" role="3clFbw">
-              <node concept="10Nm6u" id="4lyl69neqwV" role="3uHU7w" />
-              <node concept="37vLTw" id="4lyl69neqpO" role="3uHU7B">
-                <ref role="3cqZAo" node="4lyl69nenjZ" resolve="abstractFMI" />
+            <node concept="3fqX7Q" id="6Y8yTZltpJo" role="3clFbw">
+              <node concept="2OqwBi" id="6Y8yTZltpJq" role="3fr31v">
+                <node concept="2YIFZM" id="6Y8yTZltpJr" role="2Oq$k0">
+                  <ref role="37wK5l" to="ch50:7Sbg4UjPS90" resolve="instance" />
+                  <ref role="1Pybhc" to="ch50:7Sbg4UjP3T$" resolve="ConfigCombinationLogic" />
+                </node>
+                <node concept="liA8E" id="6Y8yTZltpJs" role="2OqNvi">
+                  <ref role="37wK5l" to="ch50:7Sbg4UjOEaG" resolve="allowAbstractSubConfigs" />
+                </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="6Y8yTZlttUq" role="3cqZAp" />
           <node concept="3SKdUt" id="73vFf09CZ5u" role="3cqZAp">
             <node concept="1PaTwC" id="73vFf09CZ5v" role="1aUNEU">
               <node concept="3oM_SD" id="73vFf09CZYI" role="1PaTwD">