Merge maintenance/mps20241 into merge/mps20241

Author: github-actions[bot]

CHANGELOG.md

@@ -15,6 +15,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - Variability: The propagation of configuration updates to referencing configurations has been improved. Due to this optimization, it needs much less CPU time now.
 
+### Changed
+
+- Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.
+
 
 ## November 2025
 

build.gradle.kts

@@ -370,7 +370,30 @@ fun MavenPom.includeAdditionalInfo() {
     }
 }
 
-fun MavenPom.addBundledDependencies() = bundledDependencies.forEach { addDependency(it, "provided") }
+fun MavenPom.addBundledDependencies() {
+    val seen = mutableSetOf<ResolvedDependency>()
+    val queue = ArrayDeque<ResolvedDependency>()
+
+    // Visit each bundled dependency, including its transitive dependencies if so configured, so that the exact set
+    // of used JARs ends up in the POM as provided dependencies.
+    for (config in bundledDependencies) {
+        queue.addAll(config.resolvedConfiguration.firstLevelModuleDependencies)
+
+        while (!queue.isEmpty()) {
+            val dep = queue.removeFirst()
+            if (seen.add(dep)) {
+                addDependency(
+                    dep.moduleGroup,
+                    dep.moduleName,
+                    dep.moduleVersion,
+                    dep.moduleArtifacts.first().type,
+                    "provided"
+                )
+                queue.addAll(dep.children)
+            }
+        }
+    }
+}
 
 publishing {
     repositories {
@@ -408,6 +431,7 @@ publishing {
 
             pom.addDependency(languageLibs)
             pom.includeAdditionalInfo()
+            pom.addBundledDependencies()
         }
 
         create<MavenPublication>("tests") {
@@ -421,7 +445,6 @@ publishing {
                 moduleVersion = project.version.toString(),
                 type = "zip"
             )
-            pom.addBundledDependencies()
             pom.includeAdditionalInfo()
         }
         val runtimesDir = file(artifactsDir).resolve("org.iets3.opensource/org.iets3.core.os/languages/iets3.core.os")

code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps

@@ -7,7 +7,6 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="s6b7" ref="r:a7e2f963-3e46-49e0-a385-e8c7f33c91b7(org.iets3.variability.featuremodel.base.structure)" />
     <import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
@@ -73,7 +72,7 @@
     <property role="TrG5h" value="EmptyVariabilityContent" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232912648" />
-    <ref role="1TJDcQ" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3tsFshP5d$9" role="PzmwI">
       <ref role="PrY4T" node="3tsFshP5cTx" resolve="IVariabilityContent" />
     </node>
@@ -88,24 +87,18 @@
     <node concept="PrWs8" id="22kx7U4Kqjy" role="PrDN$">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
-    <node concept="PrWs8" id="51M$6hf3mdw" role="PrDN$">
-      <ref role="PrY4T" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-    </node>
   </node>
   <node concept="PlHQZ" id="3tsFshP5cTx">
     <property role="TrG5h" value="IVariabilityContent" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232909921" />
-    <node concept="PrWs8" id="51M$6hf3mdH" role="PrDN$">
-      <ref role="PrY4T" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-    </node>
   </node>
   <node concept="1TIwiD" id="3tsFshP56tQ">
     <property role="TrG5h" value="VariabilityModelChunk" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232883574" />
-    <ref role="1TJDcQ" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
+    <ref role="1TJDcQ" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
     <node concept="PrWs8" id="22kx7U49GUo" role="PzmwI">
       <ref role="PrY4T" node="22kx7U49GUn" resolve="IVariabilityContainer" />
     </node>

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

@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)</dependency>
     <dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
+    <dependency reexport="false">165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -101,7 +102,8 @@
     <module reference="165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)" version="36" />
   </dependencyVersions>
   <extendedLanguages>
-    <extendedLanguage>165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</extendedLanguage>
+    <extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
+    <extendedLanguage>db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</extendedLanguage>
   </extendedLanguages>
 </language>