Skip to content

Commit c1158be

Browse files
alexanderpannalexanderpann
authored
Merge branch 'master' into renovate/com.github.breadmoirai.github-release-2.x
2 parents 75a8275 + d6afb40 commit c1158be

File tree

183 files changed

+757893
-2028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+757893
-2028
lines changed

‎.github/workflows/vulnerability-scanning.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ jobs:
66
name: depecheck_test
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1010
- name: Setup Java
11-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
11+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
1212
with:
1313
distribution: temurin
1414
java-version: 17

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ cell-screenshots/
2929
# -----------------------------------------------------------
3030
.idea
3131
workspace.xml
32+
.ideaconfig
3233

3334
# -----------------------------------------------------------
3435
# JUNIT
@@ -45,13 +46,15 @@ classes_gen
4546
source_gen
4647
source_gen.caches
4748
test_gen
49+
doc_gen
4850
test_gen.caches
4951
code/languages/*/*.iws
5052
code/languages/*/build.properties
5153
code/languages/*/TEST*.xml
5254
code/languages/org.iets3.core/build/tmp
5355
.mps-caches
5456
*.iml
57+
.mpsconfig
5558

5659
# -----------------------------------------------------------
5760
# GRADLE

‎CHANGELOG.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,31 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
9+
## July 2025
10+
11+
### Fixed
12+
13+
- Expressions of ShortLambdas are now correctly updated and used for interpretation after they are changed
14+
- API for coverage calculation and restored original functionality. Coverage is now calculated during interpreter execution
15+
- Duplicated colors for PARTIAL and IGNORED
16+
17+
### Added
18+
- CI tests for InterpreterCoverageAssQuery which make use use the calculated coverage data
19+
- Solver: Add test infrastructure to ensure that errors computed by any solver are converted to editor messages properly.
20+
- Variability: APIs for FilterParams (configuration of filter&instantiate process) and skeleton tree data structure were extended
21+
22+
823
## June 2025
924

25+
### Added
26+
27+
- Added languages and solution for basic variability, moved from IETS3-Core project. The following modules were added:
28+
- variability: `org.iets3.variability.*` (6 languages, 2 solutions)
29+
- variability devkit: `org.iets3.variability.base.devkit`
30+
- analysis support: `org.iets3.analysis.logic.operator`, `org.iets3.analysis.solversupport.util`
31+
- contextfilter for UI: `org.iets3.contextfilter`, `org.iets3.contextfilter.plugin`
32+
1033
### Changed
1134

1235
- Published SBOM contains dependencies only from runtime configurations
@@ -17,6 +40,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1740
An [enhancement script](http://127.0.0.1:63320/node?ref=r%3A531014dc-62ca-45fa-b1c2-cf992369440b%28org.iets3.core.expr.typetags.physunits.scripts%29%2F6252521573649140294)
1841
is provided to replace 'mu' with 'micro sign'.
1942

43+
2044
## May 2025
2145

2246
### Changed

‎README.md‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ For details, see the [wiki](https://github.com/IETS3/iets3.opensource/wiki/Suppo
2626
| MPS version | Nexus | branch |
2727
| --------------- | --------------- | --------------- |
2828
| Master | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [master](https://github.com/IETS3/iets3.opensource/tree/master) |
29+
| 2025.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2025.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) |
2930
| 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2024.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) |
3031
| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) |
3132
| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) |
@@ -62,15 +63,26 @@ The project is separated into the following virtual packages:
6263

6364
### analysis
6465

65-
| Name | Description |
66+
| Name | Description |
6667
| ------------- | ------------- |
67-
| org.iets3.analysis.base | This language contains basic concepts and interfaces and a plugin solution related to solvers. |
68+
| test.org.iets3.analysis.base | Test for solver supoprt. |
69+
| test.org.iets3.analysis.base.solvable | Language used in the tests. |
70+
| org.iets3.analysis.solversupport.util | Supporting classes for analysis with solver. |
71+
| org.iets3.analysis.base |  This language contains basic concepts and interfaces and a plugin solution related to solvers. |
72+
| org.iets3.analysis.logic.operator | This language provide operators to build model checking rules. |
6873

6974
### assessment
7075
| Name | Description |
7176
| ------------- | ------------- |
7277
| org.iets3.core.assessment | It contains an [AssessmentQuery](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733115675) to find [untraced elements](http://127.0.0.1:63320/node?ref=r%3A23d7e401-548b-485c-bdf1-c060e259073c%28org.iets3.core.assessment.structure%29%2F3587241503657463099). It can be used inside an instance of [Assessment](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733114044) inside an [AssessmentContainer](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733114043). It also contains a [generic trace query](http://127.0.0.1:63320/node?ref=r%3A23d7e401-548b-485c-bdf1-c060e259073c%28org.iets3.core.assessment.structure%29%2F6913547888673489335) to find traced elements. |
7378

79+
### contextfilter
80+
81+
| Name | Description |
82+
| ------------- | ------------- |
83+
| org.iets3.contextfilter.plugin | This solution provide the plugin suport for the context filtering. |
84+
| org.iets3.contextfilter | This language allows for selecting references (aka instances) of selected nodes in a projection . |
85+
7486
### comp (component)
7587

7688
| Name | Description |
@@ -188,7 +200,17 @@ This package includes all things related to tracing ([KernelF reference: page 27
188200
### variability
189201
| Name | Description |
190202
| ------------- | ------------- |
191-
| org.iets3.variability.artifacts.base | This language contains basic concepts and interfaces related to variability. |
203+
| org.iets3.variability.artifacts.typesystem.runtime | Runtime classes and interfaces to support org.iets3.variability.artifacts.typesystem. |
204+
| org.iets3.variability.artifacts.base | This language contains basic concepts and interfaces related to variation point in artifacts. |
205+
| org.iets3.variability.artifacts.baseline | This language allows for removing variability from artifacts (baselining). |
206+
| org.iets3.variability.artifacts.typesystem | This language provide support for verification of artifact with variability. |
207+
| org.iets3.variability.artifacts.vanguard | This language contains basic concepts and interfaces related to variation point in artifacts. NOTE: It will be merged into org.iets3.variability.artifacts.base. |
208+
| org.iets3.variability.base.ide | This solution provides contribution to the IDE, e.g the visualisation of SkeletonTree used by variability algorithms as datas structure. |
209+
| org.iets3.variability.base | This language contains common concepts to support feature models, configuraions and artifacts. |
210+
| org.iets3.variability.configuration.base | This language allows for defining configurations of feature models. |
211+
| org.iets3.variability.featuremodel.base | This language allows for modeling feature models. |
212+
| org.iets3.variability.os.sandbox | This sandbox contains some variability modeling examples. |
213+
| org.iets3.variability.base.devkit | This devkit exposes all basic variability functionalities. |
192214

193215
## Devkits
194216

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ plugins {
1111
id 'base'
1212
id 'maven-publish'
1313
id 'de.itemis.mps.gradle.common' version '1.29.+'
14-
id 'de.itemis.mps.gradle.launcher' version '2.6.1.+'
1514
id "com.github.breadmoirai.github-release" version "2.5.2"
15+
id 'de.itemis.mps.gradle.launcher' version '2.7.0.+'
1616
id "org.cyclonedx.bom" version "2.3.1"
1717
}
1818

@@ -48,7 +48,7 @@ def minor = "9"
4848

4949

5050

51-
ext.mpsVersion = "252.18003.129"
51+
ext.mpsVersion = "252.18003.155"
5252
def mpsQAVersion = "$major.$minor+"
5353

5454

@@ -149,7 +149,7 @@ class BundledDep {
149149
}
150150

151151
def bundledDeps = [
152-
new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.2'], 'org.iets3.core.expr.base.collections.stubs'),
152+
new BundledDep('pcollections', ['org.pcollections:pcollections:5.0.0'], 'org.iets3.core.expr.base.collections.stubs'),
153153
new BundledDep('bigMath', ['ch.obermuhlner:big-math:2.3.2'], 'org.iets3.core.expr.math.interpreter'),
154154
new BundledDep('functionalJava', ['org.functionaljava:functionaljava:5.0'], 'org.iets3.core.expr.genjava.functionalJava'),
155155
new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7'], 'org.iets3.opensource.build.gentests.rt').overrideArtifactName('takari-cpsuite.jar')

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.repl.devkit/org.iets3.core.expr.repl.devkit.devkit" folder="expr.lang-core" />
2020
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.stateful.devkit/org.iets3.core.expr.stateful.devkit.devkit" folder="expr.lang-stateful" />
2121
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.req/org.iets3.req.devkit" folder="req" />
22+
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.variability.base.devkit/org.iets3.variability.base.devkit.devkit" folder="variability" />
2223
<modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl" folder="analysis" />
24+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.logic.operator/org.iets3.analysis.logic.operator.mpl" folder="analysis" />
2325
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.core/org.iets3.components.core.mpl" folder="comp" />
2426
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.functional/org.iets3.components.functional.mpl" folder="comp" />
2527
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.hardware/org.iets3.components.hardware.mpl" folder="comp" />
2628
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd" folder="comp" />
2729
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.req/org.iets3.components.req.mpl" folder="comp" />
2830
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.toplevel.adapter/org.iets3.components.toplevel.adapter.mpl" folder="comp" />
31+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.contextfilter/org.iets3.contextfilter.mpl" folder="contextfilter" />
2932
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl" folder="assessmt" />
3033
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl" folder="core" />
3134
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.base/org.iets3.core.base.mpl" folder="core" />
@@ -86,15 +89,23 @@
8689
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
8790
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
8891
<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.vanguard/org.iets3.variability.artifacts.vanguard.mpl" folder="variability" />
92+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl" folder="variability.artifacts" />
93+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.baseline/org.iets3.variability.artifacts.baseline.mpl" folder="variability.artifacts" />
94+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.typesystem/org.iets3.variability.artifacts.typesystem.mpl" folder="variability.artifacts" />
95+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.vanguard/org.iets3.variability.artifacts.vanguard.mpl" folder="variability.artifacts" />
96+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.base/org.iets3.variability.base.mpl" folder="variability.modeling" />
97+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.configuration.base/org.iets3.variability.configuration.base.mpl" folder="variability.modeling" />
98+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl" folder="variability.modeling" />
9099
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
91100
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
92101
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />
93102
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.nix/test.ts.expr.os.nix.mpl" folder="expr.tests" />
94103
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
95104
<modulePath path="$PROJECT_DIR$/solutions/InterpreterTestExecutor/InterpreterTestExecutor.msd" folder="_build" />
105+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.analysis.solversupport.util/org.iets3.analysis.solversupport.util.msd" folder="analysis" />
96106
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd" folder="comp" />
97107
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd" folder="comp" />
108+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.contextfilter.plugin/org.iets3.contextfilter.plugin.msd" folder="contextfilter" />
98109
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd" folder="expr.lang-advanced" />
99110
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd" folder="expr.lang-core" />
100111
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd" folder="expr.lang-core" />
@@ -152,6 +163,9 @@
152163
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />
153164
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd" folder="_build" />
154165
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
166+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.artifacts.typesystem.runtime/org.iets3.variability.artifacts.typesystem.runtime.msd" folder="variability.artifacts" />
167+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.base.ide/org.iets3.variability.base.ide.msd" folder="variability.ide" />
168+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.os.sandbox/org.iets3.variability.os.sandbox.msd" folder="variability" />
155169
<modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
156170
<modulePath path="$PROJECT_DIR$/tests/test.components.functional/test.components.functional.msd" folder="comp.tests" />
157171
<modulePath path="$PROJECT_DIR$/tests/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.tests" />
@@ -162,8 +176,11 @@
162176
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
163177
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
164178
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.tests" />
179+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.common.base/test.org.iets3.common.base.msd" folder="variability.tests" />
165180
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
166181
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.protocol.transport/test.org.iets3.protocol.transport.msd" folder="comp.protocols" />
182+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.configuration.base/test.org.iets3.variability.configuration.base.msd" folder="variability.tests" />
183+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.featuremodel.base/test.org.iets3.variability.featuremodel.base.msd" folder="variability.tests" />
167184
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
168185
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
169186
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />

0 commit comments

Comments
 (0)