Skip to content

ST6RI-984 (preliminary) Values computed while a reference is transiently unresolved are kept after it resolves #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seidewitz merged 6 commits into from
Oct 29, 2026
+273 −140
Merged

ST6RI-984 (preliminary) Values computed while a reference is transiently unresolved are kept after it resolves #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de50dc4
ST6RI-984 Updated version to 0.63.1 (for 2026-09.1).
seidewitz Oct 26, 2026
a143c7c
ST6RI-984 Resolved Binding Connector end proxies in validation check.
seidewitz Oct 28, 2026
591a7e8
ST6RI-984 Added SysMLInteractiveTest NestedResolutionTest.
seidewitz Oct 26, 2026
f9b7f00
ST6RI-984 Updated FeatureAdapter and some Utils to not add/cache proxies
seidewitz Oct 26, 2026
d81b2ad
ST6RI-984 Added workflow dispatch to Github actions "build" workflow.
seidewitz Oct 27, 2026
926f670
ST6RI-984 Updated to version 0.64.0.
seidewitz Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
name: Java CI with Maven

on:
workflow_dispatch:
push:
branches: [ "master" ]
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.expressions.xtext,
Expand Down
4 changes: 2 additions & 2 deletions org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.expressions.xtext,
Expand All @@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext,
org.eclipse.xtext.builder,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
org.omg.sysml;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.64.0",
org.eclipse.xtext.common.types.ui
Import-Package: org.apache.log4j
Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix,
Expand Down
6 changes: 3 additions & 3 deletions org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext
Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand All @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.omg.sysml.model.bundle;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.63.0",
org.omg.sysml.model.bundle;bundle-version="0.64.0",
org.omg.sysml;bundle-version="0.64.0",
org.eclipse.uml2.uml,
org.eclipse.uml2.uml.resources,
org.eclipse.xtext.common.types,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.owl.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.owl,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.owl.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.owl,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.owl
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand Down
10 changes: 5 additions & 5 deletions org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Bundle-Name: org.omg.kerml.xpect.tests
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)",
org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",
org.eclipse.emf.codegen;bundle-version="2.6.0",
org.eclipse.xtext.xbase;bundle-version="2.9.2",
org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
org.omg.sysml;bundle-version="0.63.0",
org.omg.sysml.logic.bundle;bundle-version="0.63.0",
org.omg.kerml.xtext;bundle-version="0.63.0",
org.omg.kerml.xtext.ui;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.64.0",
org.omg.sysml.logic.bundle;bundle-version="0.64.0",
org.omg.kerml.xtext;bundle-version="0.64.0",
org.omg.kerml.xtext.ui;bundle-version="0.64.0",
org.aopalliance;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.omg.kerml.xpect,
Expand Down
6 changes: 3 additions & 3 deletions org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.xtext,
org.eclipse.xtext.ide,
org.eclipse.xtend.lib,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0"
org.omg.kerml.expressions.xtext;bundle-version="0.64.0",
org.omg.kerml.expressions.xtext.ide;bundle-version="0.64.0"
Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr
14 changes: 7 additions & 7 deletions org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.xtext,
Expand All @@ -19,12 +19,12 @@ Require-Bundle: org.omg.kerml.xtext,
org.eclipse.xtext.builder,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
org.omg.sysml.model.bundle;bundle-version="0.63.0",
org.omg.sysml.logic.bundle;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.63.0",
org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0",
org.omg.kerml.expressions.xtext.ui;bundle-version="0.63.0",
org.omg.sysml.model.bundle;bundle-version="0.64.0",
org.omg.sysml.logic.bundle;bundle-version="0.64.0",
org.omg.sysml;bundle-version="0.64.0",
org.omg.kerml.expressions.xtext;bundle-version="0.64.0",
org.omg.kerml.expressions.xtext.ide;bundle-version="0.64.0",
org.omg.kerml.expressions.xtext.ui;bundle-version="0.64.0",
org.eclipse.xtext.common.types.ui,
org.eclipse.emf.ecore.editor
Import-Package: org.apache.log4j
Expand Down
10 changes: 5 additions & 5 deletions org.omg.kerml.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.xtext
Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand All @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.omg.sysml.model.bundle;bundle-version="0.63.0",
org.omg.sysml.logic.bundle;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.63.0",
org.omg.sysml.model.bundle;bundle-version="0.64.0",
org.omg.sysml.logic.bundle;bundle-version="0.64.0",
org.omg.sysml;bundle-version="0.64.0",
org.eclipse.uml2.uml,
org.eclipse.uml2.uml.resources,
org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
org.omg.kerml.expressions.xtext;bundle-version="0.64.0",
com.google.gson,
org.eclipse.xtext.common.types,
org.objectweb.asm;bundle-version="9.3.0";resolution:=optional
Expand Down
7 changes: 5 additions & 2 deletions org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ import org.omg.sysml.lang.sysml.EndFeatureMembership
import org.omg.sysml.lang.sysml.CollectExpression
import org.omg.sysml.lang.sysml.SelectExpression
import org.omg.sysml.lang.sysml.IndexExpression
import org.eclipse.emf.ecore.util.EcoreUtil

/**
* This class contains custom validation rules.
Expand Down Expand Up @@ -957,8 +958,10 @@ class KerMLValidator extends AbstractKerMLValidator {
// } else {
// TODO: Add validateBindingConnectorTypeConformance
//Binding type conformance
val f1types = rf.get(0).type
val f2types = rf.get(1).type
val rf1 = EcoreUtil.resolve(rf.get(0), location) as Feature
val rf2 = EcoreUtil.resolve(rf.get(1), location) as Feature
val f1types = rf1.type
val f2types = rf2.type
val boolType = SysMLLibraryUtil.getLibraryType(location, "Performances::BooleanEvaluation")

if (!(typesConform(f1types, f2types) ||
Expand Down
4 changes: 2 additions & 2 deletions org.omg.sysml.edit/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.omg.sysml.edit;singleton:=true
Automatic-Module-Name: org.omg.sysml.edit
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand All @@ -13,5 +13,5 @@ Export-Package: org.omg.sysml.lang.sysml.provider
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.edit;visibility:=reexport,
org.eclipse.uml2.common.edit;visibility:=reexport,
org.omg.sysml.model.bundle;bundle-version="0.63.0";visibility:=reexport
org.omg.sysml.model.bundle;bundle-version="0.64.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion org.omg.sysml.editor.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.omg.sysml.editor.feature"
label="SysML v2 XMI Editor Feature"
version="0.63.0.qualifier"
version="0.64.0.qualifier"
provider-name="SysML v2 Submission Team">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.editor/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.omg.sysml.editor;singleton:=true
Automatic-Module-Name: org.omg.sysml.editor
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.omg.sysml.lang.sysml.presentation.SysMLEditorPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
8 changes: 4 additions & 4 deletions org.omg.sysml.execution/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.omg.sysml.execution;singleton:=true
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Automatic-Module-Name: org.omg.sysml.execution
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Name: org.omg.sysml.execution
Bundle-Vendor: SysML v2 Submission Team
Bundle-ActivationPolicy: lazy
Export-Package: org.omg.sysml.execution.expressions
Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.0",
org.omg.sysml.logic.bundle;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.63.0"
Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.64.0",
org.omg.sysml.logic.bundle;bundle-version="0.64.0",
org.omg.sysml;bundle-version="0.64.0"
2 changes: 1 addition & 1 deletion org.omg.sysml.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.omg.sysml.feature"
label="SysML v2 Feature"
version="0.63.0.qualifier"
version="0.64.0.qualifier"
provider-name="SysML v2 Submission Team">

<description url="http://www.example.com/description">
Expand Down
16 changes: 8 additions & 8 deletions org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true
Bundle-Version: 0.63.0.qualifier
Bundle-Version: 0.64.0.qualifier
Automatic-Module-Name: org.omg.sysml.interactive.tests
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.sysml.interactive;bundle-version="0.63.0",
Require-Bundle: org.omg.sysml.interactive;bundle-version="0.64.0",
org.junit;bundle-version="4.12.0",
org.omg.sysml.model.bundle;bundle-version="0.63.0",
org.omg.sysml.logic.bundle;bundle-version="0.63.0",
org.omg.sysml;bundle-version="0.63.0",
org.omg.sysml.model.bundle;bundle-version="0.64.0",
org.omg.sysml.logic.bundle;bundle-version="0.64.0",
org.omg.sysml;bundle-version="0.64.0",
org.eclipse.xtext;bundle-version="2.22.0",
org.omg.kerml.xtext;bundle-version="0.63.0",
org.omg.sysml.xtext;bundle-version="0.63.0",
org.omg.kerml.xpect.tests;bundle-version="0.63.0"
org.omg.kerml.xtext;bundle-version="0.64.0",
org.omg.sysml.xtext;bundle-version="0.64.0",
org.omg.kerml.xpect.tests;bundle-version="0.64.0"
Loading