Skip to content

Commit 5851107

Browse files
arimerarimer
authored
Merge branch 'master' into renovate/gradle-actions-digest
2 parents add1107 + d6afb40 commit 5851107

File tree

30 files changed

+31895
-488
lines changed

30 files changed

+31895
-488
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@08eba0b27e820071cde6df949e0beb9ba4906955 # 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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@
176176
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
177177
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
178178
<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" />
179180
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
180181
<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" />
181184
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
182185
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
183186
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.behavior.mps‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@
1717
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
1818
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
1919
<import index="i05g" ref="r:211c2313-6a94-46b9-b5b0-2442332ff5ac(org.iets3.variability.artifacts.base.behavior)" />
20+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
21+
<import index="4ndm" ref="r:a9fe59d7-0b4f-42b0-925a-71cc04f93df1(org.iets3.variability.configuration.base.structure)" />
22+
<import index="hpe4" ref="r:f2970992-e26d-4370-b625-3d51e8af7e7f(org.iets3.variability.artifacts.baseline.plugin)" />
23+
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
2024
</imports>
2125
<registry>
2226
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
27+
<concept id="6496299201655527393" name="jetbrains.mps.lang.behavior.structure.LocalBehaviorMethodCall" flags="nn" index="BsUDl" />
2328
<concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
2429
<reference id="1225194240799" name="concept" index="13h7C2" />
2530
<child id="1225194240805" name="method" index="13h7CS" />
@@ -46,9 +51,15 @@
4651
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
4752
<child id="1137022507850" name="body" index="2VODD2" />
4853
</concept>
54+
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
55+
<property id="1070475926801" name="value" index="Xl_RC" />
56+
</concept>
4957
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
5058
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
5159
</concept>
60+
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
61+
<child id="1164991057263" name="throwable" index="YScLw" />
62+
</concept>
5263
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
5364
<child id="1068431790190" name="initializer" index="33vP2m" />
5465
</concept>
@@ -75,6 +86,7 @@
7586
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
7687
<child id="1068581517665" name="statement" index="3cqZAp" />
7788
</concept>
89+
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
7890
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
7991
<child id="1068581517676" name="expression" index="3cqZAk" />
8092
</concept>
@@ -92,6 +104,10 @@
92104
<reference id="1107535924139" name="classifier" index="3uigEE" />
93105
<child id="1109201940907" name="parameter" index="11_B2D" />
94106
</concept>
107+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
108+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
109+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
110+
</concept>
95111
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
96112
<child id="1178549979242" name="visibility" index="1B3o_S" />
97113
</concept>
@@ -108,6 +124,9 @@
108124
</concept>
109125
</language>
110126
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
127+
<concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
128+
<property id="5858074156537516431" name="text" index="x79VB" />
129+
</concept>
111130
<concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
112131
<concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
113132
<reference id="6832197706140518108" name="param" index="zr_51" />
@@ -412,6 +431,105 @@
412431
</node>
413432
</node>
414433
</node>
434+
<node concept="13i0hz" id="5bEmt06_eiH" role="13h7CS">
435+
<property role="13i0it" value="true" />
436+
<property role="TrG5h" value="filteringParameters" />
437+
<node concept="3Tm1VV" id="5bEmt06_eiI" role="1B3o_S" />
438+
<node concept="3uibUv" id="5bEmt06_eXm" role="3clF45">
439+
<ref role="3uigEE" to="eagd:7xQHGgVP0D3" resolve="FilterParams" />
440+
</node>
441+
<node concept="3clFbS" id="5bEmt06_eiK" role="3clF47">
442+
<node concept="3cpWs8" id="5bEmt06_ULN" role="3cqZAp">
443+
<node concept="3cpWsn" id="5o9wjw0aRgp" role="3cpWs9">
444+
<property role="TrG5h" value="ivaaMaybe" />
445+
<node concept="3uibUv" id="5o9wjw0aQHh" role="1tU5fm">
446+
<ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
447+
<node concept="3Tqbb2" id="5o9wjw0aQHk" role="11_B2D">
448+
<ref role="ehGHo" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
449+
</node>
450+
</node>
451+
<node concept="BsUDl" id="5bEmt06_Zmy" role="33vP2m">
452+
<ref role="37wK5l" node="5o9wjw02jJe" resolve="ivaa" />
453+
</node>
454+
</node>
455+
</node>
456+
<node concept="3clFbJ" id="5bEmt06A1qf" role="3cqZAp">
457+
<node concept="3clFbS" id="5bEmt06A1qh" role="3clFbx">
458+
<node concept="3cpWs6" id="5bEmt06A5B6" role="3cqZAp">
459+
<node concept="2OqwBi" id="5bEmt06A5B7" role="3cqZAk">
460+
<node concept="2YIFZM" id="5bEmt06A5B8" role="2Oq$k0">
461+
<ref role="37wK5l" to="eagd:23GXxyebEdY" resolve="builder" />
462+
<ref role="1Pybhc" to="eagd:7xQHGgVP0D3" resolve="FilterParams" />
463+
<node concept="2OqwBi" id="5bEmt06A7Gw" role="37wK5m">
464+
<node concept="37vLTw" id="5bEmt06A5B9" role="2Oq$k0">
465+
<ref role="3cqZAo" node="5o9wjw0aRgp" resolve="ivaaMaybe" />
466+
</node>
467+
<node concept="liA8E" id="5bEmt06A8tR" role="2OqNvi">
468+
<ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
469+
</node>
470+
</node>
471+
<node concept="2OqwBi" id="5bEmt06A5Ba" role="37wK5m">
472+
<node concept="13iPFW" id="5bEmt06A5Bb" role="2Oq$k0" />
473+
<node concept="3TrEf2" id="5bEmt06A5Bc" role="2OqNvi">
474+
<ref role="3Tt5mk" to="oe8b:4VcV5lH5FF_" resolve="configuration" />
475+
</node>
476+
</node>
477+
</node>
478+
<node concept="liA8E" id="5bEmt06A5Bd" role="2OqNvi">
479+
<ref role="37wK5l" to="eagd:7x1s9KPkt3d" resolve="build" />
480+
</node>
481+
</node>
482+
</node>
483+
</node>
484+
<node concept="2OqwBi" id="5bEmt06A3C$" role="3clFbw">
485+
<node concept="37vLTw" id="5bEmt06A2tq" role="2Oq$k0">
486+
<ref role="3cqZAo" node="5o9wjw0aRgp" resolve="ivaaMaybe" />
487+
</node>
488+
<node concept="liA8E" id="5bEmt06A4wD" role="2OqNvi">
489+
<ref role="37wK5l" to="33ny:~Optional.isPresent()" resolve="isPresent" />
490+
</node>
491+
</node>
492+
</node>
493+
<node concept="YS8fn" id="5o9wjw03uTM" role="3cqZAp">
494+
<node concept="2ShNRf" id="5o9wjw03vJq" role="YScLw">
495+
<node concept="1pGfFk" id="5o9wjw03DT$" role="2ShVmc">
496+
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
497+
<node concept="3cpWs3" id="5o9wjw03Hg3" role="37wK5m">
498+
<node concept="2OqwBi" id="5o9wjw03Kgx" role="3uHU7w">
499+
<node concept="2OqwBi" id="5o9wjw03IMf" role="2Oq$k0">
500+
<node concept="13iPFW" id="5bEmt06AbEC" role="2Oq$k0" />
501+
<node concept="3TrEf2" id="5o9wjw03JDQ" role="2OqNvi">
502+
<ref role="3Tt5mk" to="oe8b:4VcV5lH5FF$" resolve="artifact" />
503+
</node>
504+
</node>
505+
<node concept="2qgKlT" id="5o9wjw03KUj" role="2OqNvi">
506+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
507+
</node>
508+
</node>
509+
<node concept="Xl_RD" id="5o9wjw03ELQ" role="3uHU7B">
510+
<property role="Xl_RC" value="No IVariabilityAwareArtifact found for " />
511+
</node>
512+
</node>
513+
</node>
514+
</node>
515+
</node>
516+
</node>
517+
<node concept="P$JXv" id="5bEmt06Ai82" role="lGtFl">
518+
<node concept="TZ5HA" id="5bEmt06Ai83" role="TZ5H$">
519+
<node concept="1dT_AC" id="5bEmt06Ai84" role="1dT_Ay">
520+
<property role="1dT_AB" value="Setup filtering parameters to be used during base line." />
521+
</node>
522+
</node>
523+
<node concept="TZ5HA" id="5bEmt06Aj88" role="TZ5H$">
524+
<node concept="1dT_AC" id="5bEmt06Aj89" role="1dT_Ay">
525+
<property role="1dT_AB" value="If the method is not overwritten default parameters will be used." />
526+
</node>
527+
</node>
528+
<node concept="x79VA" id="5bEmt06Ai85" role="3nqlJM">
529+
<property role="x79VB" value="an instance of FilterParams used to configure baselining for this item" />
530+
</node>
531+
</node>
532+
</node>
415533
</node>
416534
</model>
417535

0 commit comments

Comments
 (0)