Skip to content

Commit 0ec9258

Browse files
mfsoliveiramfsoliveira
authored
Merge pull request #1339 from IETS3/merge/mps20241
Merge maintenance/mps20241 into master
2 parents 1886e66 + 12fe45d commit 0ec9258

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
77

88
## May 2025
99

10+
### Changed
11+
12+
- The language org.iets3.variability.artifacts.base was temporarily renamed to org.iets3.variability.artifacts.vanguard.
13+
1014
### Fixed
1115

1216
- Plugin org.iets3.safety was renamed to org.iets3.safety.os fixing the name collision with a plugin in org.iets3.core

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
8787
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
8888
<modulePath path="$PROJECT_DIR$/languages/org.iets3.safety.attributes/org.iets3.safety.attributes.mpl" folder="safety" />
89-
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl" folder="variability" />
89+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.vanguard/org.iets3.variability.artifacts.vanguard.mpl" folder="variability" />
9090
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
9191
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
9292
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps‎ renamed to ‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.vanguard/models/org.iets3.variability.artifacts.vanguard.behavior.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model ref="r:b827b941-aa66-4f79-b830-0e73f1e33465(org.iets3.variability.artifacts.base.behavior)">
2+
<model ref="r:b827b941-aa66-4f79-b830-0e73f1e33465(org.iets3.variability.artifacts.vanguard.behavior)">
33
<persistence version="9" />
44
<languages>
55
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -10,7 +10,7 @@
1010
<imports>
1111
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
1212
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
13-
<import index="7c17" ref="r:1696fe6e-226e-4158-a6f2-3b9fa1ea7a02(org.iets3.variability.artifacts.base.structure)" implicit="true" />
13+
<import index="7c17" ref="r:1696fe6e-226e-4158-a6f2-3b9fa1ea7a02(org.iets3.variability.artifacts.vanguard.structure)" implicit="true" />
1414
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1515
</imports>
1616
<registry>

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.editor.mps‎ renamed to ‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.vanguard/models/org.iets3.variability.artifacts.vanguard.editor.mps‎

File renamed without changes.

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.structure.mps‎ renamed to ‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.vanguard/models/org.iets3.variability.artifacts.vanguard.structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model ref="r:1696fe6e-226e-4158-a6f2-3b9fa1ea7a02(org.iets3.variability.artifacts.base.structure)">
2+
<model ref="r:1696fe6e-226e-4158-a6f2-3b9fa1ea7a02(org.iets3.variability.artifacts.vanguard.structure)">
33
<persistence version="9" />
44
<languages>
55
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl‎ renamed to ‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.vanguard/org.iets3.variability.artifacts.vanguard.mpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<language namespace="org.iets3.variability.artifacts.base" uuid="c6ff3b3b-aff6-455e-9637-7955ccbfec22" languageVersion="0" moduleVersion="0">
2+
<language namespace="org.iets3.variability.artifacts.vanguard" uuid="c6ff3b3b-aff6-455e-9637-7955ccbfec22" languageVersion="0" moduleVersion="0">
33
<models>
44
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
@@ -73,7 +73,7 @@
7373
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
7474
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
7575
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="20" />
76-
<module reference="c6ff3b3b-aff6-455e-9637-7955ccbfec22(org.iets3.variability.artifacts.base)" version="0" />
76+
<module reference="c6ff3b3b-aff6-455e-9637-7955ccbfec22(org.iets3.variability.artifacts.vanguard)" version="0" />
7777
</dependencyVersions>
7878
<extendedLanguages />
7979
</language>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@
10071007
</node>
10081008
</node>
10091009
<node concept="m$_yB" id="7B3y$vlfYcO" role="m$_yh">
1010-
<ref role="m$_yA" node="7B3y$vlfY21" resolve="org.iets3.variability.artifacts.base" />
1010+
<ref role="m$_yA" node="7B3y$vlfY21" resolve="org.iets3.variability.artifacts.vanguard" />
10111011
</node>
10121012
</node>
10131013
<node concept="m$_wf" id="2qK410x44K4" role="3989C9">
@@ -14151,16 +14151,16 @@
1415114151
<property role="TrG5h" value="org.iets3.variability.os" />
1415214152
<node concept="1E1JtD" id="7B3y$vlfY21" role="2G$12L">
1415314153
<property role="BnDLt" value="true" />
14154-
<property role="TrG5h" value="org.iets3.variability.artifacts.base" />
14154+
<property role="TrG5h" value="org.iets3.variability.artifacts.vanguard" />
1415514155
<property role="3LESm3" value="c6ff3b3b-aff6-455e-9637-7955ccbfec22" />
1415614156
<node concept="398BVA" id="7B3y$vlfY3H" role="3LF7KH">
1415714157
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1415814158
<node concept="2Ry0Ak" id="7B3y$vlfY71" role="iGT6I">
1415914159
<property role="2Ry0Am" value="languages" />
1416014160
<node concept="2Ry0Ak" id="7B3y$vlfY8G" role="2Ry0An">
14161-
<property role="2Ry0Am" value="org.iets3.variability.artifacts.base" />
14162-
<node concept="2Ry0Ak" id="7B3y$vlfYbb" role="2Ry0An">
14163-
<property role="2Ry0Am" value="org.iets3.variability.artifacts.base.mpl" />
14161+
<property role="2Ry0Am" value="org.iets3.variability.artifacts.vanguard" />
14162+
<node concept="2Ry0Ak" id="1TJmaFV9UK3" role="2Ry0An">
14163+
<property role="2Ry0Am" value="org.iets3.variability.artifacts.vanguard.mpl" />
1416414164
</node>
1416514165
</node>
1416614166
</node>
@@ -14169,20 +14169,20 @@
1416914169
<property role="3ZfqAx" value="models" />
1417014170
<property role="1Hdu6h" value="true" />
1417114171
<property role="1HemKv" value="true" />
14172-
<node concept="3LXTmp" id="7B3y$vlfYF6" role="1HemKq">
14173-
<node concept="398BVA" id="7B3y$vlfYEU" role="3LXTmr">
14172+
<node concept="3LXTmp" id="1TJmaFV9V9N" role="1HemKq">
14173+
<node concept="398BVA" id="1TJmaFV9V9C" role="3LXTmr">
1417414174
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
14175-
<node concept="2Ry0Ak" id="7B3y$vlfYEV" role="iGT6I">
14175+
<node concept="2Ry0Ak" id="1TJmaFV9V9D" role="iGT6I">
1417614176
<property role="2Ry0Am" value="languages" />
14177-
<node concept="2Ry0Ak" id="7B3y$vlfYEW" role="2Ry0An">
14178-
<property role="2Ry0Am" value="org.iets3.variability.artifacts.base" />
14179-
<node concept="2Ry0Ak" id="7B3y$vlfYEX" role="2Ry0An">
14177+
<node concept="2Ry0Ak" id="1TJmaFV9V9E" role="2Ry0An">
14178+
<property role="2Ry0Am" value="org.iets3.variability.artifacts.vanguard" />
14179+
<node concept="2Ry0Ak" id="1TJmaFV9V9F" role="2Ry0An">
1418014180
<property role="2Ry0Am" value="models" />
1418114181
</node>
1418214182
</node>
1418314183
</node>
1418414184
</node>
14185-
<node concept="3qWCbU" id="7B3y$vlfYF7" role="3LXTna">
14185+
<node concept="3qWCbU" id="1TJmaFV9V9O" role="3LXTna">
1418614186
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
1418714187
</node>
1418814188
</node>
@@ -14196,8 +14196,8 @@
1419614196
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1419714197
<node concept="2Ry0Ak" id="5lyt3iujJ9W" role="iGT6I">
1419814198
<property role="2Ry0Am" value="languages" />
14199-
<node concept="2Ry0Ak" id="5lyt3iujJbA" role="2Ry0An">
14200-
<property role="2Ry0Am" value="org.iets3.variability.artifacts.base" />
14199+
<node concept="2Ry0Ak" id="7cnLyJJwQYP" role="2Ry0An">
14200+
<property role="2Ry0Am" value="org.iets3.variability.artifacts.vanguard" />
1420114201
</node>
1420214202
</node>
1420314203
</node>

0 commit comments

Comments
 (0)